aboutsummaryrefslogtreecommitdiff
path: root/libindicator/indicator-service.c
diff options
context:
space:
mode:
Diffstat (limited to 'libindicator/indicator-service.c')
-rw-r--r--libindicator/indicator-service.c88
1 files changed, 61 insertions, 27 deletions
diff --git a/libindicator/indicator-service.c b/libindicator/indicator-service.c
index fc3c7de..15335f3 100644
--- a/libindicator/indicator-service.c
+++ b/libindicator/indicator-service.c
@@ -29,6 +29,7 @@ License along with this library. If not, see
#include "indicator-service.h"
+static void unwatch_core (IndicatorService * service, const gchar * name);
/* DBus Prototypes */
static gboolean _indicator_service_server_watch (IndicatorService * service, DBusGMethodInvocation * method);
static gboolean _indicator_service_server_un_watch (IndicatorService * service, DBusGMethodInvocation * method);
@@ -50,8 +51,9 @@ typedef struct _IndicatorServicePrivate IndicatorServicePrivate;
struct _IndicatorServicePrivate {
gchar * name;
DBusGProxy * dbus_proxy;
+ DBusGConnection * bus;
guint timeout;
- GList * watchers;
+ GHashTable * watchers;
guint this_service_version;
};
@@ -158,11 +160,14 @@ indicator_service_init (IndicatorService *self)
priv->dbus_proxy = NULL;
priv->timeout = 0;
priv->watchers = NULL;
+ priv->bus = NULL;
priv->this_service_version = 0;
+ priv->watchers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref);
+
/* Start talkin' dbus */
GError * error = NULL;
- DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_STARTER, &error);
+ priv->bus = dbus_g_bus_get(DBUS_BUS_STARTER, &error);
if (error != NULL) {
g_error("Unable to get starter bus: %s", error->message);
g_error_free(error);
@@ -171,7 +176,7 @@ indicator_service_init (IndicatorService *self)
/* I think this should automatically, but I can't find confirmation
of that, so we're putting the extra little code in here. */
error = NULL;
- bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+ priv->bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
if (error != NULL) {
g_error("Unable to get session bus: %s", error->message);
g_error_free(error);
@@ -179,7 +184,7 @@ indicator_service_init (IndicatorService *self)
}
}
- priv->dbus_proxy = dbus_g_proxy_new_for_name_owner(bus,
+ priv->dbus_proxy = dbus_g_proxy_new_for_name_owner(priv->bus,
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
@@ -190,7 +195,7 @@ indicator_service_init (IndicatorService *self)
return;
}
- dbus_g_connection_register_g_object(bus,
+ dbus_g_connection_register_g_object(priv->bus,
INDICATOR_SERVICE_OBJECT,
G_OBJECT(self));
@@ -230,8 +235,7 @@ indicator_service_finalize (GObject *object)
}
if (priv->watchers != NULL) {
- g_list_foreach(priv->watchers, (GFunc)g_free, NULL);
- g_list_free(priv->watchers);
+ g_hash_table_destroy(priv->watchers);
priv->watchers = NULL;
}
@@ -372,6 +376,19 @@ try_and_get_name (IndicatorService * service)
return;
}
+/* 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));
+
+ const gchar * name = dbus_g_proxy_get_bus_name(DBUS_G_PROXY(proxy));
+ unwatch_core(INDICATOR_SERVICE(user_data), name);
+
+ return;
+}
+
/* Here is the function that gets called by the dbus
interface "Watch" function. It is an async function so
that we can get the sender and store that information. We
@@ -382,8 +399,24 @@ _indicator_service_server_watch (IndicatorService * service, DBusGMethodInvocati
g_return_val_if_fail(INDICATOR_IS_SERVICE(service), FALSE);
IndicatorServicePrivate * priv = INDICATOR_SERVICE_GET_PRIVATE(service);
- priv->watchers = g_list_append(priv->watchers,
- g_strdup(dbus_g_method_get_sender(method)));
+ const gchar * sender = dbus_g_method_get_sender(method);
+ if (g_hash_table_lookup(priv->watchers, sender) == NULL) {
+ GError * error = NULL;
+ DBusGProxy * senderproxy = dbus_g_proxy_new_for_name_owner(priv->bus,
+ sender,
+ "/",
+ DBUS_INTERFACE_INTROSPECTABLE,
+ &error);
+
+ g_signal_connect(G_OBJECT(senderproxy), "destroy", G_CALLBACK(proxy_destroyed), service);
+
+ if (error == NULL) {
+ g_hash_table_insert(priv->watchers, g_strdup(sender), senderproxy);
+ } else {
+ g_warning("Unable to create proxy for watcher '%s': %s", sender, error->message);
+ g_error_free(error);
+ }
+ }
if (priv->timeout != 0) {
g_source_remove(priv->timeout);
@@ -394,38 +427,40 @@ _indicator_service_server_watch (IndicatorService * service, DBusGMethodInvocati
return TRUE;
}
-/* Mung g_strcmp0 into GCompareFunc */
-static gint
-find_watcher (gconstpointer a, gconstpointer b)
-{
- return g_strcmp0((const gchar *)a, (const gchar *)b);
-}
-
/* A function connecting into the dbus interface for the
"UnWatch" function. It is also an async function to get
- the sender. It then looks the sender up and removes them
- from the list of watchers. If there are none left, it then
- starts the timer for the shutdown signal. */
+ the sender and passes everything to unwatch_core to remove it. */
static gboolean
_indicator_service_server_un_watch (IndicatorService * service, DBusGMethodInvocation * method)
{
g_return_val_if_fail(INDICATOR_IS_SERVICE(service), FALSE);
+
+ unwatch_core(service, dbus_g_method_get_sender(method));
+
+ dbus_g_method_return(method);
+ return TRUE;
+}
+
+/* Performs the core of loosing a watcher; it removes them
+ from the list of watchers. If there are none left, it then
+ starts the timer for the shutdown signal. */
+static void
+unwatch_core (IndicatorService * service, const gchar * name)
+{
IndicatorServicePrivate * priv = INDICATOR_SERVICE_GET_PRIVATE(service);
/* Remove us from the watcher list here */
- GList * watcher_item = g_list_find_custom(priv->watchers, dbus_g_method_get_sender(method), find_watcher);
+ gpointer watcher_item = g_hash_table_lookup(priv->watchers, name);
if (watcher_item != NULL) {
/* Free the watcher */
- gchar * name = watcher_item->data;
- priv->watchers = g_list_remove(priv->watchers, name);
- g_free(name);
+ g_hash_table_remove(priv->watchers, name);
} else {
/* Odd that we couldn't find the person, but, eh */
- g_warning("Unable to find watcher who is unwatching: %s", dbus_g_method_get_sender(method));
+ g_warning("Unable to find watcher who is unwatching: %s", name);
}
/* If we're out of watchers set the timeout for shutdown */
- if (priv->watchers == NULL) {
+ if (g_hash_table_size(priv->watchers) == 0) {
if (priv->timeout != 0) {
/* This should never really happen, but let's ensure that
bad things don't happen if it does. */
@@ -437,8 +472,7 @@ _indicator_service_server_un_watch (IndicatorService * service, DBusGMethodInvoc
priv->timeout = g_timeout_add(500, timeout_no_watchers, service);
}
- dbus_g_method_return(method);
- return TRUE;
+ return;
}
/* API */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 18:46:04 +0000