aboutsummaryrefslogtreecommitdiff
path: root/src/libappindicator
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2010-02-19 12:24:17 -0500
committerKen VanDine <ken.vandine@canonical.com>2010-02-19 12:24:17 -0500
commita889ee7685e4d5d5cf8fe51467eb9ad8121475a1 (patch)
treed2ac1c012f6e70d31617d73c3d429cdfa60e3b70 /src/libappindicator
parentb1e72a50c92348a707396990cea5474143bff8cf (diff)
downloadlibayatana-appindicator-a889ee7685e4d5d5cf8fe51467eb9ad8121475a1.tar.gz
libayatana-appindicator-a889ee7685e4d5d5cf8fe51467eb9ad8121475a1.tar.bz2
libayatana-appindicator-a889ee7685e4d5d5cf8fe51467eb9ad8121475a1.zip
* Cherrypick fix to check for a null string as the attention icon
* Cherrypick fix to remove the registration of dbus objects (LP: #497870) - lets us drop debian/patches/unregister.patch
Diffstat (limited to 'src/libappindicator')
-rw-r--r--src/libappindicator/app-indicator.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index bb3c71f..cd28bdd 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -598,6 +598,7 @@ check_connect (AppIndicator *self)
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 @@ check_connect (AppIndicator *self)
/* 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 @@ watcher_proxy_destroyed (GObject * object, gpointer data)
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 @@ register_service_cb (DBusGProxy * proxy, GError * error, gpointer data)
/* 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);