aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/unregister.patch39
2 files changed, 46 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1e782a5..a63aa68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-application (0.0.13-0ubuntu5) UNRELEASED; urgency=low
+
+ * debian/patches/unregister.patch
+ - Fix to remove the registration of dbus objects (LP: #497870)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 19 Feb 2010 11:16:13 -0500
+
indicator-application (0.0.13-0ubuntu4) lucid; urgency=low
* Backport Cody Russell's change to fix rhythmbox crashing on closing
diff --git a/debian/patches/unregister.patch b/debian/patches/unregister.patch
new file mode 100644
index 0000000..87b2bb2
--- /dev/null
+++ b/debian/patches/unregister.patch
@@ -0,0 +1,39 @@
+=== modified file 'src/libappindicator/app-indicator.c'
+--- src/libappindicator/app-indicator.c 2010-02-17 22:04:09 +0000
++++ src/libappindicator/app-indicator.c 2010-02-19 15:21:19 +0000
+@@ -598,6 +598,7 @@
+ if (priv->id == NULL) return;
+
+ gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->clean_id);
++
+ dbus_g_connection_register_g_object(priv->connection,
+ path,
+ G_OBJECT(self));
+@@ -612,6 +613,8 @@
+ /* Unable to get proxy, but we're handling that now so
+ it's not a warning anymore. */
+ g_error_free(error);
++ dbus_g_connection_unregister_g_object(priv->connection,
++ G_OBJECT(self));
+ start_fallback_timer(self, FALSE);
+ g_free(path);
+ return;
+@@ -632,6 +635,8 @@
+ AppIndicator * self = APP_INDICATOR(data);
+ g_return_if_fail(self != NULL);
+
++ dbus_g_connection_unregister_g_object(self->priv->connection,
++ G_OBJECT(self));
+ self->priv->watcher_proxy = NULL;
+ start_fallback_timer(self, FALSE);
+ return;
+@@ -649,6 +654,8 @@
+ /* They didn't respond, ewww. Not sure what they could
+ be doing */
+ g_warning("Unable to connect to the Notification Watcher: %s", error->message);
++ dbus_g_connection_unregister_g_object(priv->connection,
++ G_OBJECT(data));
+ g_object_unref(G_OBJECT(priv->watcher_proxy));
+ priv->watcher_proxy = NULL;
+ start_fallback_timer(APP_INDICATOR(data), TRUE);
+