From 20a18796af50c0360055bf5b9fecd1f699268d18 Mon Sep 17 00:00:00 2001
From: Andrew Williams <nikdoof@vektor>
Date: Tue, 13 Jan 2009 21:58:22 +0000
Subject: [PATCH] Updated suspend/hibernate commands to use HAL, added
 safesuspend

---
 cb-openbox-logout.py                      | 13 +++++++++----
 po/en/LC_MESSAGES/cb-openbox-logout.po    |  3 +++
 po/en_GB/LC_MESSAGES/cb-openbox-logout.po |  3 +++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/cb-openbox-logout.py b/cb-openbox-logout.py
index 6d8a11c..c1d1514 100755
--- a/cb-openbox-logout.py
+++ b/cb-openbox-logout.py
@@ -34,7 +34,7 @@ import string
 class OpenboxLogout():
     def __init__(self, config=None):
         
-        self.validbuttons = ['cancel', 'logout', 'restart', 'shutdown', 'suspend', 'hibernate']
+        self.validbuttons = ['cancel', 'logout', 'restart', 'shutdown', 'suspend', 'hibernate', 'safesuspend']
         
         self.load_config(config)
         
@@ -254,10 +254,15 @@ class OpenboxLogout():
         elif (data=='shutdown'):
             os.system('gdm-control --shutdown && openbox --exit')
         elif (data=='suspend'):
-            os.system('dbus-send --session --dest=org.gnome.PowerManager --type=method_call --reply-timeout=2000 /org/gnome/PowerManager org.gnome.PowerManager.Suspend')
+            os.system('dbus-send --system --print-reply --dest=org.freedesktop.Hal /org/freedesktop/Hal/devices/computer org.freedesktop.Hal.Device.SystemPowerManagement.Suspend int32:0')
+            self.quit()
         elif (data=='hibernate'):
-            os.system('dbus-send --session --dest=org.gnome.PowerManager --type=method_call --reply-timeout=2000 /org/gnome/PowerManager org.gnome.PowerManager.Hibernate')         
-
+            os.system('dbus-send --system --print-reply --dest=org.freedesktop.Hal /org/freedesktop/Hal/devices/computer org.freedesktop.Hal.Device.SystemPowerManagement.Hibernate')         
+            self.quit()
+        elif (data=='safesuspend'):
+            os.system('dbus-send --system --print-reply --dest=org.freedesktop.Hal /org/freedesktop/Hal/devices/computer org.freedesktop.Hal.Device.SystemPowerManagement.SuspendHybrid int32:0')         
+            self.quit()
+            
     def on_keypress(self, widget=None, event=None, data=None):
         if event.keyval == gtk.keysyms.Escape:
             self.quit() 
diff --git a/po/en/LC_MESSAGES/cb-openbox-logout.po b/po/en/LC_MESSAGES/cb-openbox-logout.po
index 6afb565..746018e 100644
--- a/po/en/LC_MESSAGES/cb-openbox-logout.po
+++ b/po/en/LC_MESSAGES/cb-openbox-logout.po
@@ -18,3 +18,6 @@ msgstr "Suspend"
 
 msgid "hibernate"
 msgstr "Hibernate"
+
+msgid "safesuspend"
+msgstr "Safe Suspend"
diff --git a/po/en_GB/LC_MESSAGES/cb-openbox-logout.po b/po/en_GB/LC_MESSAGES/cb-openbox-logout.po
index 6afb565..746018e 100644
--- a/po/en_GB/LC_MESSAGES/cb-openbox-logout.po
+++ b/po/en_GB/LC_MESSAGES/cb-openbox-logout.po
@@ -18,3 +18,6 @@ msgstr "Suspend"
 
 msgid "hibernate"
 msgstr "Hibernate"
+
+msgid "safesuspend"
+msgstr "Safe Suspend"