r30657 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/03_deal_with_absence_of_gnome-session.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Oct 17 15:40:07 2011
New Revision: 30657

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30657
Log:
* debian/patches/03_deal_with_absence_of_gnome-session.patch:
  - Deal with absence of gnome-session gracefully and don't crash if
    gnome-session is not running. Patch cherry-picked from upstream Git.
    Closes: #645429

Added:
    desktop/unstable/gnome-settings-daemon/debian/patches/03_deal_with_absence_of_gnome-session.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=30657&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Mon Oct 17 15:40:07 2011
@@ -1,3 +1,12 @@
+gnome-settings-daemon (3.0.3-3) UNRELEASED; urgency=low
+
+  * debian/patches/03_deal_with_absence_of_gnome-session.patch:
+    - Deal with absence of gnome-session gracefully and don't crash if
+      gnome-session is not running. Patch cherry-picked from upstream Git.
+      Closes: #645429
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 17 Oct 2011 17:35:22 +0200
+
 gnome-settings-daemon (3.0.3-2) unstable; urgency=low
 
   * debian/control.in:

Added: desktop/unstable/gnome-settings-daemon/debian/patches/03_deal_with_absence_of_gnome-session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/03_deal_with_absence_of_gnome-session.patch?rev=30657&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/03_deal_with_absence_of_gnome-session.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/03_deal_with_absence_of_gnome-session.patch [utf-8] Mon Oct 17 15:40:07 2011
@@ -1,0 +1,41 @@
+commit 5c931cd037cdcc9b5dbb48371b8edc993a8872c0
+Author: Matthias Clasen <mclasen at redhat.com>
+Date:   Mon May 2 14:23:53 2011 -0400
+
+    updates: deal with absence of gnome-session gracefully
+    
+    This was leading to crashes when g-s-d got started under xfce.
+    Reported and tested in
+    http://bugzilla.redhat.com/show_bug.cgi?id=698533
+
+diff --git a/plugins/updates/gsd-updates-refresh.c b/plugins/updates/gsd-updates-refresh.c
+index 15e6917..60d5f80 100644
+--- a/plugins/updates/gsd-updates-refresh.c
++++ b/plugins/updates/gsd-updates-refresh.c
+@@ -560,7 +560,7 @@ gsd_updates_refresh_init (GsdUpdatesRefresh *refresh)
+         /* use gnome-session for the idle detection */
+         refresh->priv->proxy_session =
+                 g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+-                                               G_DBUS_PROXY_FLAGS_NONE,
++                                               G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+                                                NULL, /* GDBusInterfaceInfo */
+                                                "org.gnome.SessionManager",
+                                                "/org/gnome/SessionManager/Presence",
+@@ -578,9 +578,14 @@ gsd_updates_refresh_init (GsdUpdatesRefresh *refresh)
+                                   refresh);
+                 status = g_dbus_proxy_get_cached_property (refresh->priv->proxy_session,
+                                                            "status");
+-                g_variant_get (status, "u", &status_code);
+-                refresh->priv->session_idle = (status_code == PRESENCE_STATUS_IDLE);
+-                g_variant_unref (status);
++                if (status) {
++                        g_variant_get (status, "u", &status_code);
++                        refresh->priv->session_idle = (status_code == PRESENCE_STATUS_IDLE);
++                        g_variant_unref (status);
++                }
++                else {
++                        refresh->priv->session_idle = FALSE;
++                }
+         }
+ 
+         /* we check this in case we miss one of the async signals */

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=30657&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Mon Oct 17 15:40:07 2011
@@ -1,2 +1,3 @@
 01_medias_keys_dont_go_up_to_11.patch
 02_missing_format.patch
+03_deal_with_absence_of_gnome-session.patch