[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[966] fvwm/components/functions

[<dom...@us...>]

Revision: 966
          http://sourceforge.net/p/fvwm-crystal/code/966
Author:   dominique_libre
Date:     2020-02-09 21:31:35 +0000 (Sun, 09 Feb 2020)
Log Message:
-----------
Exit menu: cleanup

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/Exit

Removed Paths:
-------------
    fvwm/components/functions/Exit-systemctl

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-02-09 21:18:12 UTC (rev 965)
+++ ChangeLog	2020-02-09 21:31:35 UTC (rev 966)
@@ -2,7 +2,9 @@
 
 dimanche 9 février 2020
   fvwm/components/functions/Exit: fix xscreensaver and systemctl menu;
-  call systemctl without sudo
+  call systemctl without sudo; don't show pm-utils menu is systemd is present;
+  cleanup.
+- fvwm/components/functions/Exit-systemctl: moved to the Exit file
 
 vendredi 7 février 2020
   fvwm/components/functions/Exec-Accelerator: Fix restart of urxvtc after a kill -9

Modified: fvwm/components/functions/Exit
===================================================================
--- fvwm/components/functions/Exit	2020-02-09 21:18:12 UTC (rev 965)
+++ fvwm/components/functions/Exit	2020-02-09 21:31:35 UTC (rev 966)
@@ -105,6 +105,9 @@
 
 DestroyFunc Exit-Menu
 AddToFunc Exit-Menu
++ I InfoStoreAdd sysctl no
++ I Test (x /usr/bin/systemctl) InfoStoreAdd sysctl /usr/bin/systemctl
++ I TestRc (NoMatch) Test (x /bin/systemctl) InfoStoreAdd sysctl /bin/systemctl
 + I DestroyMenu /Exit
 + I AddToMenu /Exit 
 + I AddToMenu /Exit '%22x22/fvwm-crystal/view-refresh.png%$[gt.Restart]' Restart
@@ -111,52 +114,17 @@
 + I Test (x /usr/bin/xscreensaver) AddToMenu /Exit '%22x22/fvwm-crystal/system-lock-screen.png%$[gt.Lock screen]' X xscreensaver-command -lock
 + I Test (EnvIsSet SESSION_MANAGER) AddToMenu /Exit '%22x22/fvwm-crystal/system-log-out.png%$[gt.Logout]' QuitSession
 + I Test (!EnvIsSet SESSION_MANAGER) AddToMenu /Exit '%22x22/fvwm-crystal/system-log-out.png%$[gt.Logout]' Quit
-+ I Test (x /usr/sbin/pm-hibernate) Exit-Menu-pm
++ I Test (EnvIsSet sysctl no) Test (x /usr/sbin/pm-hibernate) Exit-Menu-pm
 + I Test (x /bin/systemctl) Exit-Menu-sysctl /bin/systemctl
-+ I TestRc (Match) InfostoreAdd ExitManager sysctl
 + I Test (x /usr/bin/systemctl) Exit-Menu-sysctl /usr/bin/systemctl
-+ I TestRc (Match) InfoStoreAdd ExitManager sysctl
 + I Test (EnvIsSet SESSION_MANAGER) AddToMenu /Exit '' Nop
 Test (EnvIsSet SESSION_MANAGER) AddToMenu /Exit '%22x22/fvwm-crystal/gdm.png%$[gt.Save session]' Exec exec gnome-session-save --gui
 Test (EnvIsSet SESSION_MANAGER) AddToMenu /Exit '%22x22/fvwm-crystal/gdm.png%$[gt.Manage session]' Exec exec gnome-session-properties
-+ I Test (!EnvMatch infostore.ExitManager sysctl) Exit-SelectLogoutManager
++ I Test (EnvMatch infostore.sysctl no) Exit-SelectLogoutManager
 + I InfoStoreRemove ExitManager
 
 Exit-Menu
 
-#DestroyMenu /Exit
-#AddToMenu /Exit 
-#+ '%22x22/fvwm-crystal/view-refresh.png%$[gt.Restart]' Restart
-#Test (x xscreensaver) + '%22x22/fvwm-crystal/system-lock-screen.png%$[gt.Lock screen]' X xscreensaver-command -lock
-#Test (EnvIsSet SESSION_MANAGER) + '%22x22/fvwm-crystal/system-log-out.png%$[gt.Logout]' QuitSession
-#Test (!EnvIsSet SESSION_MANAGER) + '%22x22/fvwm-crystal/system-log-out.png%$[gt.Logout]' Quit
-#Test (x /usr/sbin/pm-hibernate) + '' Nop
-#Test (x /usr/sbin/pm-hibernate) + '%22x22/fvwm-crystal/gdm.png%$[gt.Automatic suspend to disk]' Popup /AutoHibernate
-#Test (x /usr/bin/systemctl) + '%22x22/fvwm-crystal/gdm.png%$[gt.Automatic suspend to disk]' Popup /AutoHibernate
-#Test (x /usr/sbin/pm-suspend-hybrid) + '%22x22/fvwm-crystal/gdm.png%$[gt.Resume hybride with screen lid]' Popup /ScreenLidSuspend
-#Test (x /usr/sbin/pm-suspend) + '' Nop
-#Test (x /usr/sbin/pm-suspend) + '%22x22/fvwm-crystal/gdm.png%$[gt.Resume to RAM]' S pm-suspend
-#Test (x /usr/sbin/pm-suspend-hybrid) + '%22x22/fvwm-crystal/gdm.png%$[gt.Resume hybride]' S pm-suspend-hybrid
-#Test (x /usr/sbin/pm-hibernate) + '%22x22/fvwm-crystal/gdm.png%$[gt.Suspend to disk]' S pm-hibernate
-#Test (x /usr/sbin/pm-powersave) + '%22x22/fvwm-crystal/gdm.png%$[gt.Powersave]' S pm-powersave
-#Test (x /usr/bin/systemctl) + '' Nop
-#Test (x /usr/bin/systemctl) + '%22x22/fvwm-crystal/gdm.png%$[gt.Resume to RAM]' S systemctl suspend -i
-#Test (X systemctl) + '%22x22/fvwm-crystal/gdm.png%$[gt.Suspend to disk]' S systemctl hibernate -i
-#Test (EnvIsSet SESSION_MANAGER) + '' Nop
-#Test (EnvIsSet SESSION_MANAGER) + '%22x22/fvwm-crystal/gdm.png%$[gt.Save session]' Exec exec gnome-session-save --gui
-#Test (EnvIsSet SESSION_MANAGER) + '%22x22/fvwm-crystal/gdm.png%$[gt.Manage session]' Exec exec gnome-session-properties
-
-DestroyFunc Exit-SelectExitManager
-#AddToFunc Exit-SelectExitManager
-#+ I Test (X systemctl) Include components/functions/Exit-systemctl
-#+ I TestRc (NoMatch) Include components/functions/Exit-sudo
-
-DestroyFunc Exit-SelectLoginManager
-#AddToFunc Exit-SelectLoginManager
-#+ I Test (X gdmflexiserver) PipeRead 'pidof gdm > /dev/null && echo "Include components/functions/Exit-gdm" || echo "Exit-SelectExitManager"'
-#+ I TestRc (NoMatch) Exit-SelectExitManager
-
-#Exit-SelectLoginManager
 Test (x /usr/sbin/pm-hibernate) AddToFunc ExitFunction I Test (ToRestart) KillAutoHibernate
 
 # vim:ft=fvwm

Deleted: fvwm/components/functions/Exit-systemctl
===================================================================
--- fvwm/components/functions/Exit-systemctl	2020-02-09 21:18:12 UTC (rev 965)
+++ fvwm/components/functions/Exit-systemctl	2020-02-09 21:31:35 UTC (rev 966)
@@ -1,9 +0,0 @@
-# Exit commands - works with systemd
-# Created by: Dominique Michel <dom...@us...>
-
-AddToMenu /Exit 
-Test (X systemctl) + "" Nop
-Test (X systemctl) + '%22x22/fvwm-crystal/system-reboot.png%$[gt.Reboot computer]' S systemctl reboot -i
-Test (X systemctl) + '%22x22/fvwm-crystal/system-shutdown.png%$[gt.Turn off computer]' S systemctl poweroff -i
-
-# vim:ft=fvwm

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.