r44161 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch patches/series

[smcv at users.alioth.debian.org]

Author: smcv
Date: Fri Mar 13 22:20:08 2015
New Revision: 44161

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44161
Log:
* Team upload
* power-make-sure-to-set-an-error-when-GDBus-set_prope.patch:
  set the error when a GDBus set_property callback fails
  (hopefully Closes: #775877)

Added:
    desktop/unstable/gnome-settings-daemon/debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.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=44161&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog	[utf-8] Fri Mar 13 22:20:08 2015
@@ -1,3 +1,12 @@
+gnome-settings-daemon (3.14.2-3) unstable; urgency=medium
+
+  * Team upload
+  * power-make-sure-to-set-an-error-when-GDBus-set_prope.patch:
+    set the error when a GDBus set_property callback fails
+    (hopefully Closes: #775877)
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 09 Mar 2015 09:49:20 +0000
+
 gnome-settings-daemon (3.14.2-2) unstable; urgency=medium
 
   * 01_reinstate_updates_plugin.patch: reinstate the “updates” plugin, 

Added: desktop/unstable/gnome-settings-daemon/debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch?rev=44161&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch	(added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch	[utf-8] Fri Mar 13 22:20:08 2015
@@ -0,0 +1,28 @@
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Mon, 9 Mar 2015 09:48:16 +0000
+Subject: power: make sure to set an error when GDBus set_property fails
+
+If we return FALSE, the API is that the error must be set, and
+GDBus asserts this.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=745920
+Bug-Debian: https://bugs.debian.org/775877
+Reviewed-by: Bastien Nocera
+Applied-upstream: 3.15.92, commit:4e8448a; 3.14.3, commit:d91542c
+---
+ plugins/power/gsd-power-manager.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index b31ec6d..eafa082 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -2771,6 +2771,8 @@ handle_set_property (GDBusConnection *connection,
+         /* Check session pointer as a proxy for whether the manager is in the
+            start or stop state */
+         if (manager->priv->session == NULL) {
++                g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
++                             "Manager is starting or stopping");
+                 return FALSE;
+         }
+ 

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=44161&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 13 22:20:08 2015
@@ -1,3 +1,4 @@
 01_reinstate_updates_plugin.patch
 04_superP.patch
 30_xrandr_dbus_init.patch
+power-make-sure-to-set-an-error-when-GDBus-set_prope.patch