Merge lp:~muktupavels/gnome-panel/lp-1076830 into lp:ubuntu/utopic/gnome-panel

[Alberts Muktupāvels]

Fix crash when removing in-process applet from panel and then again adding it back. (LP: #1076830)

Fix crash when removing in-process applet from panel and then again adding it back. (LP: #1076830)

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-23 18:48:54 +0000
+++ debian/changelog	2014-09-02 19:54:20 +0000
@@ -1,3 +1,10 @@
+gnome-panel (1:3.8.1-1ubuntu2) UNRELEASED; urgency=medium
+
+  * Fix crash when in-process applet is removed from panel and then
+    added back to panel. (LP: #1076830)
+
+ -- Alberts Muktupāvels <[e-mail]>  Tue, 02 Sep 2014 22:38:05 +0300
+
 gnome-panel (1:3.8.1-1ubuntu1) utopic; urgency=medium
 
   * Merge with Debian unreleased Svn, remaining changes:

=== added file 'debian/patches/lp-1076830.patch'
--- debian/patches/lp-1076830.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp-1076830.patch	2014-09-02 19:54:20 +0000
@@ -0,0 +1,64 @@
+From 4cc44248050cf2603e2a5c9185c7a63704529e3e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <[e-mail]>
+Date: Tue, 2 Sep 2014 22:17:01 +0300
+Subject: [PATCH] libpanel-applet: unown bus name and unregister dbus object
+
+https://bugzilla.gnome.org/show_bug.cgi?id=692610
+---
+ libpanel-applet/panel-applet-factory.c | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/libpanel-applet/panel-applet-factory.c b/libpanel-applet/panel-applet-factory.c
+index 7e8895c..57ac8f4 100644
+--- a/libpanel-applet/panel-applet-factory.c
++++ b/libpanel-applet/panel-applet-factory.c
+@@ -28,6 +28,10 @@ struct _PanelAppletFactory {
+ 	guint      n_applets;
+ 	GType      applet_type;
+ 	GClosure  *closure;
++
++	GDBusConnection *connection;
++	gint             owner_id;
++	gint             registration_id;
+ };
+ 
+ struct _PanelAppletFactoryClass {
+@@ -44,6 +48,16 @@ panel_applet_factory_finalize (GObject *object)
+ {
+ 	PanelAppletFactory *factory = PANEL_APPLET_FACTORY (object);
+ 
++	if (factory->registration_id) {
++		g_dbus_connection_unregister_object (factory->connection, factory->registration_id);
++		factory->registration_id = 0;
++	}
++
++	if (factory->owner_id) {
++		g_bus_unown_name (factory->owner_id);
++		factory->owner_id = 0;
++	}
++
+ 	if (factory->factory_id) {
+ 		g_free (factory->factory_id);
+ 		factory->factory_id = NULL;
+@@ -218,7 +232,8 @@ on_bus_acquired (GDBusConnection    *connection,
+ 	if (!introspection_data)
+ 		introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
+ 	object_path = g_strdup_printf (PANEL_APPLET_FACTORY_OBJECT_PATH, factory->factory_id);
+-	g_dbus_connection_register_object (connection,
++	factory->connection = connection;
++	factory->registration_id = g_dbus_connection_register_object (connection,
+ 					   object_path,
+ 					   introspection_data->interfaces[0],
+ 					   &interface_vtable,
+@@ -246,7 +261,7 @@ panel_applet_factory_register_service (PanelAppletFactory *factory)
+ 	gchar *service_name;
+ 
+ 	service_name = g_strdup_printf (PANEL_APPLET_FACTORY_SERVICE_NAME, factory->factory_id);
+-	g_bus_own_name (G_BUS_TYPE_SESSION,
++	factory->owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
+ 			service_name,
+ 			G_BUS_NAME_OWNER_FLAGS_NONE,
+ 			(GBusAcquiredCallback) on_bus_acquired,
+-- 
+2.1.0
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-08-23 18:48:54 +0000
+++ debian/patches/series	2014-09-02 19:54:20 +0000
@@ -8,3 +8,4 @@
 51_desktop_file.patch
 lp-1314706.patch
 clock-fix-expanding.patch
+lp-1076830.patch