diff options
author | Ted Gould <ted@gould.cx> | 2010-07-08 14:06:12 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-07-08 14:06:12 -0500 |
commit | 3899f93c3e4d68d160088fd9f7ace702ca064ae4 (patch) | |
tree | 2fd16b2c9f79405ccc82bd67ca82dabb95d82266 /libindicator/indicator-service.c | |
parent | 569196687e0eed1ae841e50b449f95d071736fa4 (diff) | |
parent | 7412490502f6f249479c1f4d7e07ab868530dcd0 (diff) | |
download | libayatana-indicator-3899f93c3e4d68d160088fd9f7ace702ca064ae4.tar.gz libayatana-indicator-3899f93c3e4d68d160088fd9f7ace702ca064ae4.tar.bz2 libayatana-indicator-3899f93c3e4d68d160088fd9f7ace702ca064ae4.zip |
Fixing signals so that our tests pass
Diffstat (limited to 'libindicator/indicator-service.c')
-rw-r--r-- | libindicator/indicator-service.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/libindicator/indicator-service.c b/libindicator/indicator-service.c index 15335f3..db234e2 100644 --- a/libindicator/indicator-service.c +++ b/libindicator/indicator-service.c @@ -30,6 +30,8 @@ License along with this library. If not, see #include "indicator-service.h" static void unwatch_core (IndicatorService * service, const gchar * name); +static void proxy_destroyed (GObject * proxy, gpointer user_data); +static gboolean watchers_remove (gpointer key, gpointer value, gpointer user_data); /* DBus Prototypes */ static gboolean _indicator_service_server_watch (IndicatorService * service, DBusGMethodInvocation * method); static gboolean _indicator_service_server_un_watch (IndicatorService * service, DBusGMethodInvocation * method); @@ -163,6 +165,10 @@ indicator_service_init (IndicatorService *self) priv->bus = NULL; priv->this_service_version = 0; + /* NOTE: We're using g_object_unref here because that's what needs to + happen, but you really should call watchers_remove first as well + since that disconnects the signals. We can't do that with a callback + here because there is no user data to pass the object as well. */ priv->watchers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref); /* Start talkin' dbus */ @@ -209,6 +215,10 @@ indicator_service_dispose (GObject *object) { IndicatorServicePrivate * priv = INDICATOR_SERVICE_GET_PRIVATE(object); + if (priv->watchers != NULL) { + g_hash_table_foreach_remove(priv->watchers, watchers_remove, object); + } + if (priv->dbus_proxy != NULL) { g_object_unref(G_OBJECT(priv->dbus_proxy)); priv->dbus_proxy = NULL; @@ -314,6 +324,15 @@ get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspe return; } +/* A function to remove the signals on a proxy before we destroy + it because in this case we've stopped caring. */ +static gboolean +watchers_remove (gpointer key, gpointer value, gpointer user_data) +{ + g_signal_handlers_disconnect_by_func(G_OBJECT(value), G_CALLBACK(proxy_destroyed), user_data); + return TRUE; +} + /* This is the function that gets executed if we timeout because there are no watchers. We sent the shutdown signal and hope someone does something sane with it. */ @@ -453,6 +472,7 @@ unwatch_core (IndicatorService * service, const gchar * name) gpointer watcher_item = g_hash_table_lookup(priv->watchers, name); if (watcher_item != NULL) { /* Free the watcher */ + watchers_remove((gpointer)name, watcher_item, service); g_hash_table_remove(priv->watchers, name); } else { /* Odd that we couldn't find the person, but, eh */ |