Accepting request 280845 from home:VictorYang:branches:X11:windowmanagers

Fix the bnc#905159:shutdown and reboot commands not working

OBS-URL: https://build.opensuse.org/request/show/280845
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=33

icewm-1.3.8-shutdown-reboot-command.patch

@@ -0,0 +1,13 @@
+diff --git a/src/wmmgr.cc b/src/wmmgr.cc
+index 4252bf6..ae1c0e5 100644
+--- a/src/wmmgr.cc
++++ b/src/wmmgr.cc
+@@ -697,8 +697,6 @@ void YWindowManager::handleClientMessage(const XClientMessageEvent &message) {
+         case ICEWM_ACTION_RESTARTWM:
+         case ICEWM_ACTION_WINDOWLIST:
+         case ICEWM_ACTION_ABOUT:
+-            break;
+-        default:
+             smActionListener->handleSMAction(message.data.l[1]);
+             break;
+         }

icewm-preferences.patch

@@ -33,11 +33,11 @@ a file generated by ./src/genpref. To edit the patch:
  
  #  Command to shutdown the system
 -# ShutdownCommand=""
-+ShutdownCommand="dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Stop"
++ShutdownCommand="dbus-send --system --print-reply --dest=org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager.PowerOff boolean:true 2>&1 && return"
  
  #  Command to reboot the system
 -# RebootCommand=""
-+RebootCommand="dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Restart"
++RebootCommand="dbus-send --system --print-reply --dest=org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager.Reboot boolean:true 2>&1 && return"
  
  #  Command to run on CPU status
  # CPUStatusCommand="xterm -name top -title Process\ Status -e top"

icewm.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jan 12 07:39:53 UTC 2015 - tyang@suse.com
+
+- Fix the bnc#905159:shutdown and reboot commands not working.
+  Change the shutdown and reboot command in preference.
+  Add patch: icewm-1.3.8-shutdown-reboot-command.patch
+  and updated from upstream:https://github.com/bbidulock/icewm. 
+
 -------------------------------------------------------------------
 Tue Sep 30 06:11:49 UTC 2014 - crrodriguez@opensuse.org
 

icewm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package icewm
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -64,6 +64,7 @@ Patch9:         icewm-1.3.8-enable-guievents.patch
 Patch10:        icewm-susemenu.patch
 Patch11:        icewm-fix-themes.patch
 Patch12:        icewm-bg-default-at-error.patch
+Patch13:        icewm-1.3.8-shutdown-reboot-command.patch
 # applied in %%build
 Patch99:        icewm-preferences.patch
 Url:            http://www.icewm.org/
@@ -134,6 +135,7 @@ This package adds GNOME menu and sound support to icewm.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %define lites icewm icewmhint icewmbg icesh icewm-session