[Sawfish] Patch xfce session

[fuchur <flohtransporter@xxxxxxxxx>]

Hi,

Two patches for xfce-session:
01-menu-editor-xfce.patch
Change menueditor from alacarte to menulibre in xfce-session and
mate-session.

02-menu-logout-xfce.patch
Don't save the xfce-session by xfce4-session-logout (add -f by
xfce4-session-logout)


-- 
Regards,
Fuchur

GPG Fingerprint: CA3B 8204 5B3E 6D48 6D53  C116 E5BC 70D5 B8D7 B2B0

diff -urNad sawfish.orgi/lisp/sawfish/wm/integration/mate.jl sawfish/lisp/sawfish/wm/integration/mate.jl
--- sawfish.orgi/lisp/sawfish/wm/integration/mate.jl
+++ sawfish/lisp/sawfish/wm/integration/mate.jl
@@ -61,7 +61,7 @@
       (when (setq menu (assoc (_ "Sessi_on") root-menu))
 	(nconc menu `(()
 		      (,(_ "_Customize MATE") (system "mate-control-center &"))
-		      (,(_ "_Edit MATE menu") (system "alacarte &"))
+		      (,(_ "_Edit MATE menu") (system "menulibre &"))
 		      ()
 		      (,(_ "L_ock screen from MATE")
 			(system "mate-screensaver-command -l &"))
diff -urNad sawfish.orgi/lisp/sawfish/wm/integration/xfce.jl sawfish/lisp/sawfish/wm/integration/xfce.jl
--- sawfish.orgi/lisp/sawfish/wm/integration/xfce.jl
+++ sawfish/lisp/sawfish/wm/integration/xfce.jl
@@ -61,10 +61,7 @@
       (when (setq menu (assoc (_ "Sessi_on") root-menu))
 	(nconc menu `(()
 		      (,(_ "_Customize XFCE") (system "xfce4-settings-manager &"))
-		      ;; Since XFCE 4.6 there's no stand-alone editor anymore.
-		      ;; So what to choose? Alacarte (GNOME) or LXMed (LXDE)?
-		      ;; I'd say alacarte here...
-		      (,(_ "_Edit XFCE Menu") (system "alacarte &"))
+		      (,(_ "_Edit XFCE Menu") (system "menulibre &"))
 		      ()
 		      (,(_ "L_ock from XFCE")

diff -urNad sawfish.orgi/lisp/sawfish/wm/integration/xfce.jl sawfish/lisp/sawfish/wm/integration/xfce.jl
--- sawfish.orgi/lisp/sawfish/wm/integration/xfce.jl
+++ sawfish/lisp/sawfish/wm/integration/xfce.jl
@@ -66,15 +66,15 @@
 		      (,(_ "L_ock from XFCE")
 			(system "xflock4 &"))
 		      (,(_ "_Logout from XFCE")
-		       (system "xfce4-session-logout --logout &"))
+		       (system "xfce4-session-logout --logout -f &"))
 		      (,(_ "_Reboot from XFCE")
-		       (system "xfce4-session-logout --reboot &"))
+		       (system "xfce4-session-logout --reboot -f &"))
 		      (,(_ "_Shutdown from XFCE")
-		       (system "xfce4-session-logout --halt &"))
+		       (system "xfce4-session-logout --halt -f &"))
 		      (,(_ "_Hibernate from XFCE")
-			(system "xfce4-session-logout --hibernate &"))
+			(system "xfce4-session-logout --hibernate -f &"))
 		      (,(_ "S_uspend from XFCE")
-			(system "xfce4-session-logout --suspend &")))))))
+			(system "xfce4-session-logout --suspend -f &")))))))
 
   ;; Returns nil if xfce is not found.
   ;; If detected, returns t, and do also xfce support init.

Attachment: signature.asc
Description: PGP signature