r35103 - in /desktop/unstable/gnome-panel/debian: changelog patches/15_avoid_applet_loading_failures.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon May 21 15:45:31 2012
New Revision: 35103

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35103
Log:
debian/patches/15_avoid_applet_loading_failures.patch: Use on_bus_acquired
instead of on_name_acquired. This helps prevent race conditions at session
starts which can lead to panel applets failing to load. Closes: #649779

Added:
    desktop/unstable/gnome-panel/debian/patches/15_avoid_applet_loading_failures.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/patches/series

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=35103&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog [utf-8] Mon May 21 15:45:31 2012
@@ -1,3 +1,11 @@
+gnome-panel (3.4.2.1-2) UNRELEASED; urgency=low
+
+  * debian/patches/15_avoid_applet_loading_failures.patch: Use on_bus_acquired
+    instead of on_name_acquired. This helps prevent race conditions at session
+    starts which can lead to panel applets failing to load. Closes: #649779
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 15 May 2012 17:55:33 +0200
+
 gnome-panel (3.4.2.1-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/gnome-panel/debian/patches/15_avoid_applet_loading_failures.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/15_avoid_applet_loading_failures.patch?rev=35103&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/15_avoid_applet_loading_failures.patch (added)
+++ desktop/unstable/gnome-panel/debian/patches/15_avoid_applet_loading_failures.patch [utf-8] Mon May 21 15:45:31 2012
@@ -1,0 +1,40 @@
+From d8c6525a72ef89cb6aa5b556082bb4bc1f66ffc8 Mon Sep 17 00:00:00 2001
+From: Joachim Breitner <mail at joachim-breitner.de>
+Date: Sun, 13 Nov 2011 20:06:41 +0100
+Subject: [PATCH] libpanel-applet: Use on_bus_acquired instead of
+ on_name_acquired
+
+This helps prevent race conditions at session starts. This is actually
+recommended in the gdbus documentation.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=654843
+---
+ libpanel-applet/panel-applet-factory.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libpanel-applet/panel-applet-factory.c b/libpanel-applet/panel-applet-factory.c
+index ffe0998..5d9239b 100644
+--- a/libpanel-applet/panel-applet-factory.c
++++ b/libpanel-applet/panel-applet-factory.c
+@@ -210,7 +210,7 @@ static const GDBusInterfaceVTable interface_vtable = {
+ static GDBusNodeInfo *introspection_data = NULL;
+ 
+ static void
+-on_name_acquired (GDBusConnection    *connection,
++on_bus_acquired (GDBusConnection    *connection,
+ 		  const gchar        *name,
+ 		  PanelAppletFactory *factory)
+ {
+@@ -251,8 +251,8 @@ panel_applet_factory_register_service (PanelAppletFactory *factory)
+ 	g_bus_own_name (G_BUS_TYPE_SESSION,
+ 			service_name,
+ 			G_BUS_NAME_OWNER_FLAGS_NONE,
++			(GBusAcquiredCallback) on_bus_acquired,
+ 			NULL,
+-			(GBusNameAcquiredCallback) on_name_acquired,
+ 			(GBusNameLostCallback) on_name_lost,
+ 			factory, NULL);
+ 	g_free (service_name);
+-- 
+1.7.10
+

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=35103&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series [utf-8] Mon May 21 15:45:31 2012
@@ -3,3 +3,4 @@
 10_bookmarks_limit.patch
 11_compat_options.patch
 14_revert_timedate_change.patch
+15_avoid_applet_loading_failures.patch