aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarJulien Valroff <julien@kirya.net>2011-11-20 21:21:22 +0100
committerLibravatarJulien Valroff <julien@kirya.net>2011-11-20 21:21:22 +0100
commita968c55d27055866e15695373d851d5bb114f1cc (patch)
treea2ea488c70c83182a5caaf615b337265295b4c4b
parent0d6c43f6bceb79b1b353724261a395b979559ee2 (diff)
downloadoblogout-a968c55d27055866e15695373d851d5bb114f1cc.tar.bz2
oblogout-a968c55d27055866e15695373d851d5bb114f1cc.tar.xz
oblogout-a968c55d27055866e15695373d851d5bb114f1cc.tar.zst
Add patch to let screensaver lock screen on suspend/hibernate
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/002_default-commands.diff3
-rw-r--r--debian/patches/003_let-screensaver-lock-screen.diff22
-rw-r--r--debian/patches/series1
4 files changed, 27 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index ec4d346..a9a70c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
oblogout (0.3~bzr101-2) unstable; urgency=low
* Fix default commands
+ * Add patch to let screensaver lock screen on suspend/hibernate
- -- Julien Valroff <julien@debian.org> Sun, 20 Nov 2011 14:25:58 +0100
+ -- Julien Valroff <julien@debian.org> Sun, 20 Nov 2011 21:20:50 +0100
oblogout (0.3~bzr101-1) unstable; urgency=low
diff --git a/debian/patches/002_default-commands.diff b/debian/patches/002_default-commands.diff
index 1d4a8e5..edbe14d 100644
--- a/debian/patches/002_default-commands.diff
+++ b/debian/patches/002_default-commands.diff
@@ -23,11 +23,12 @@ Last-Update: 2011-11-20
-hibernate = pmi action hibernate
-safesuspend = safesuspend
-lock = gnome-screensaver-command -l
+-switchuser = gdm-control --switch-user
+shutdown = dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Stop
+restart = dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Restart
+suspend = dbus-send --system --print-reply --dest=org.freedesktop.UPower /org/freedesktop/UPower org.freedesktop.UPower.Suspend
+hibernate = dbus-send --system --print-reply --dest=org.freedesktop.UPower /org/freedesktop/UPower org.freedesktop.UPower.Hibernate
+safesuspend = pm-suspend-hybrid
+lock = xdg-screensaver lock
- switchuser = gdm-control --switch-user
++switch = gdmflexiserver
logout = openbox --exit
diff --git a/debian/patches/003_let-screensaver-lock-screen.diff b/debian/patches/003_let-screensaver-lock-screen.diff
new file mode 100644
index 0000000..e6d10a0
--- /dev/null
+++ b/debian/patches/003_let-screensaver-lock-screen.diff
@@ -0,0 +1,22 @@
+Description: Let screensaver decides if screen should be locked on suspend/hibernate
+Author: Julien Valroff <julien@debian.org>
+Last-Update: 2011-11-20
+
+--- a/oblogout/__init__.py
++++ b/oblogout/__init__.py
+@@ -375,7 +375,6 @@
+
+ elif (data == 'suspend'):
+ self.window.hide()
+- self.__lock_screen()
+ if self.usehal:
+ self.dbus.suspend()
+
+@@ -384,7 +383,6 @@
+
+ elif (data == 'hibernate'):
+ self.window.hide()
+- self.__lock_screen()
+ if self.usehal:
+ self.dbus.hibernate()
+ else:
diff --git a/debian/patches/series b/debian/patches/series
index 7080bd2..33d3f7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
001_disable-hal.diff
002_default-commands.diff
+003_let-screensaver-lock-screen.diff