diff options
| author | Ted Gould <ted@gould.cx> | 2010-07-09 09:58:56 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-07-09 09:58:56 -0500 |
| commit | b973537a64b23358b471604c14374b50adef4898 (patch) | |
| tree | 31010b82b9cee9c43caaecc14db5a1218047da66 | |
| parent | 613ad629e7409c8d8542851c3b84f1e313877378 (diff) | |
| parent | 74a24d7651432fb151cddb024a562bdb71aaee57 (diff) | |
| download | libayatana-indicator-b973537a64b23358b471604c14374b50adef4898.tar.gz libayatana-indicator-b973537a64b23358b471604c14374b50adef4898.tar.bz2 libayatana-indicator-b973537a64b23358b471604c14374b50adef4898.zip | |
Uhg, wrong branch
| -rw-r--r-- | libindicator/indicator-service.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/libindicator/indicator-service.c b/libindicator/indicator-service.c index db234e2..d0f8ed2 100644 --- a/libindicator/indicator-service.c +++ b/libindicator/indicator-service.c @@ -395,14 +395,26 @@ try_and_get_name (IndicatorService * service) return; } +/* Look in the hash table for the proxy, as it won't give us + its name. */ +static gboolean +hash_table_find (gpointer key, gpointer value, gpointer user_data) +{ + if (value == user_data) { + return TRUE; + } + return FALSE; +} + /* If the proxy gets destroyed that's the same as getting an unwatch signal. Make it so. */ static void proxy_destroyed (GObject * proxy, gpointer user_data) { g_return_if_fail(INDICATOR_IS_SERVICE(user_data)); + IndicatorServicePrivate * priv = INDICATOR_SERVICE_GET_PRIVATE(user_data); - const gchar * name = dbus_g_proxy_get_bus_name(DBUS_G_PROXY(proxy)); + gchar * name = (gchar *)g_hash_table_find(priv->watchers, hash_table_find, proxy); unwatch_core(INDICATOR_SERVICE(user_data), name); return; @@ -466,6 +478,9 @@ _indicator_service_server_un_watch (IndicatorService * service, DBusGMethodInvoc static void unwatch_core (IndicatorService * service, const gchar * name) { + g_return_if_fail(name != NULL); + g_return_if_fail(INDICATOR_IS_SERVICE(service)); + IndicatorServicePrivate * priv = INDICATOR_SERVICE_GET_PRIVATE(service); /* Remove us from the watcher list here */ |