r33253 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/02-lock-screensaver-on-lid-close.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Mar 16 13:45:54 2012
New Revision: 33253

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33253
Log:
Correctly lock the screensaver on lid-close when lid-close action is set
to blank and lock is enabled. Patch cherry-picked from upstream Git.
Closes: #662747

Added:
    desktop/unstable/gnome-settings-daemon/debian/patches/02-lock-screensaver-on-lid-close.patch
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/patches/series

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=33253&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Fri Mar 16 13:45:54 2012
@@ -1,3 +1,11 @@
+gnome-settings-daemon (3.2.2-3) UNRELEASED; urgency=low
+
+  * Correctly lock the screensaver on lid-close when lid-close action is set
+    to blank and lock is enabled. Patch cherry-picked from upstream Git.
+    Closes: #662747
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 16 Mar 2012 14:30:28 +0100
+
 gnome-settings-daemon (3.2.2-2) unstable; urgency=low
 
   [ Sjoerd Simons ]

Added: desktop/unstable/gnome-settings-daemon/debian/patches/02-lock-screensaver-on-lid-close.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/02-lock-screensaver-on-lid-close.patch?rev=33253&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/02-lock-screensaver-on-lid-close.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/02-lock-screensaver-on-lid-close.patch [utf-8] Fri Mar 16 13:45:54 2012
@@ -1,0 +1,59 @@
+From 2f08d3f05a71f3008ed8144212684e5754d436cf Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Fri, 16 Mar 2012 10:25:11 +0000
+Subject: [PATCH] power: Lock the screensaver if the lid is closed and lock is
+ enabled
+
+Resolves: https://bugzilla.gnome.org/show_bug.cgi?id=671445
+---
+ plugins/power/gsd-power-manager.c |   16 +++++++++++++---
+ 1 files changed, 13 insertions(+), 3 deletions(-)
+
+Index: gnome-settings-daemon-3.2.2/plugins/power/gsd-power-manager.c
+===================================================================
+--- gnome-settings-daemon-3.2.2.orig/plugins/power/gsd-power-manager.c	2011-11-08 14:48:52.000000000 +0100
++++ gnome-settings-daemon-3.2.2/plugins/power/gsd-power-manager.c	2012-03-16 14:26:29.547264964 +0100
+@@ -207,6 +207,7 @@
+ static UpDevice *engine_get_composite_device (GsdPowerManager *manager, UpDevice *original_device);
+ static UpDevice *engine_update_composite_device (GsdPowerManager *manager, UpDevice *original_device);
+ static void      do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type);
++static void      lock_screensaver (GsdPowerManager *manager);
+ 
+ G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT)
+ 
+@@ -2129,6 +2130,9 @@
+                          NULL);
+ #endif /* HAVE_LIBCANBERRA */
+ 
++        /* maybe lock the screen if the lid is closed */
++        lock_screensaver (manager);
++
+         /* we have different settings depending on AC state */
+         if (up_client_get_on_battery (manager->priv->up_client)) {
+                 action_type = g_settings_get_enum (manager->priv->settings,
+@@ -3191,9 +3195,7 @@
+ }
+ 
+ static void
+-upower_notify_sleep_cb (UpClient *client,
+-                        UpSleepKind sleep_kind,
+-                        GsdPowerManager *manager)
++lock_screensaver (GsdPowerManager *manager)
+ {
+         gboolean do_lock;
+ 
+@@ -3212,6 +3214,14 @@
+ }
+ 
+ static void
++upower_notify_sleep_cb (UpClient *client,
++                        UpSleepKind sleep_kind,
++                        GsdPowerManager *manager)
++{
++        lock_screensaver (manager);
++}
++
++static void
+ upower_notify_resume_cb (UpClient *client,
+                          UpSleepKind sleep_kind,
+                          GsdPowerManager *manager)

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=33253&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Fri Mar 16 13:45:54 2012
@@ -1,2 +1,3 @@
 01-xrandr-correct-the-type-of-the-rotation-parameter.patch
+02-lock-screensaver-on-lid-close.patch
 04_superP.patch