aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-02-16 16:54:15 -0600
committerTed Gould <ted@gould.cx>2011-02-16 16:54:15 -0600
commitabccdd7479fb3a5c1e51e52f91fbe7cada89bfd6 (patch)
tree0a887f2b3819c646c28a5c98e50281b709bacb74 /src
parent1c384cdf7e601e3786fc1add31d157c0eafa1539 (diff)
parent86d57d3066eb25150e09050b2e9cd789bc9e56da (diff)
downloadlibayatana-appindicator-abccdd7479fb3a5c1e51e52f91fbe7cada89bfd6.tar.gz
libayatana-appindicator-abccdd7479fb3a5c1e51e52f91fbe7cada89bfd6.tar.bz2
libayatana-appindicator-abccdd7479fb3a5c1e51e52f91fbe7cada89bfd6.zip
Remove registration of the object until after all possible signals are sent
Diffstat (limited to 'src')
-rw-r--r--src/app-indicator.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c
index f4e9173..79ced0a 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -579,11 +579,6 @@ app_indicator_dispose (GObject *object)
AppIndicator *self = APP_INDICATOR (object);
AppIndicatorPrivate *priv = self->priv;
- if (priv->dbus_registration != 0) {
- g_dbus_connection_unregister_object(priv->connection, priv->dbus_registration);
- priv->dbus_registration = 0;
- }
-
if (priv->shorties != NULL) {
g_object_unref(G_OBJECT(priv->shorties));
priv->shorties = NULL;
@@ -632,6 +627,11 @@ app_indicator_dispose (GObject *object)
g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE);
}
+ if (priv->dbus_registration != 0) {
+ g_dbus_connection_unregister_object(priv->connection, priv->dbus_registration);
+ priv->dbus_registration = 0;
+ }
+
if (priv->connection != NULL) {
g_object_unref(G_OBJECT(priv->connection));
priv->connection = NULL;