aboutsummaryrefslogtreecommitdiff
path: root/libindicator
diff options
context:
space:
mode:
Diffstat (limited to 'libindicator')
-rw-r--r--libindicator/indicator-service-manager.c59
-rw-r--r--libindicator/indicator-service.c42
-rw-r--r--libindicator/indicator-service.xml3
3 files changed, 89 insertions, 15 deletions
diff --git a/libindicator/indicator-service-manager.c b/libindicator/indicator-service-manager.c
index cc5c382..a3f76b2 100644
--- a/libindicator/indicator-service-manager.c
+++ b/libindicator/indicator-service-manager.c
@@ -17,6 +17,7 @@ struct _IndicatorServiceManagerPrivate {
DBusGProxy * service_proxy;
gboolean connected;
guint this_service_version;
+ DBusGConnection * bus;
};
/* Signals Stuff */
@@ -54,6 +55,7 @@ static void indicator_service_manager_finalize (GObject *object);
static void set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec);
static void get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec);
static void start_service (IndicatorServiceManager * service);
+static void unwatch_cb (DBusGProxy *proxy, GError *error, gpointer userdata);
G_DEFINE_TYPE (IndicatorServiceManager, indicator_service_manager, G_TYPE_OBJECT);
@@ -115,17 +117,18 @@ indicator_service_manager_init (IndicatorServiceManager *self)
priv->service_proxy = NULL;
priv->connected = FALSE;
priv->this_service_version = 0;
+ priv->bus = NULL;
/* Start talkin' dbus */
GError * error = NULL;
- DBusGConnection * session_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 for manager: %s", error->message);
g_error_free(error);
return;
}
- priv->dbus_proxy = dbus_g_proxy_new_for_name_owner(session_bus,
+ priv->dbus_proxy = dbus_g_proxy_new_for_name_owner(priv->bus,
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
@@ -157,6 +160,12 @@ indicator_service_manager_dispose (GObject *object)
priv->dbus_proxy = NULL;
}
+ /* If we have a proxy, tell it we're shutting down. Just
+ to be polite about it. */
+ if (priv->service_proxy != NULL) {
+ org_ayatana_indicator_service_un_watch_async(priv->service_proxy, unwatch_cb, NULL);
+ }
+
/* Destory our service proxy, we won't need it. */
if (priv->service_proxy != NULL) {
g_object_unref(G_OBJECT(priv->service_proxy));
@@ -250,6 +259,12 @@ get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspe
}
static void
+unwatch_cb (DBusGProxy *proxy, GError *error, gpointer userdata)
+{
+ return;
+}
+
+static void
watch_cb (DBusGProxy * proxy, guint service_api_version, guint this_service_version, GError * error, gpointer user_data)
{
IndicatorServiceManagerPrivate * priv = INDICATOR_SERVICE_MANAGER_GET_PRIVATE(user_data);
@@ -262,11 +277,13 @@ watch_cb (DBusGProxy * proxy, guint service_api_version, guint this_service_vers
if (service_api_version != INDICATOR_SERVICE_VERSION) {
g_warning("Service is using a different version of the service interface. Expecting %d and got %d.", INDICATOR_SERVICE_VERSION, service_api_version);
+ org_ayatana_indicator_service_un_watch_async(priv->service_proxy, unwatch_cb, NULL);
return;
}
if (this_service_version != priv->this_service_version) {
g_warning("Service is using a API version than the manager. Expecting %d and got %d.", priv->this_service_version, this_service_version);
+ org_ayatana_indicator_service_un_watch_async(priv->service_proxy, unwatch_cb, NULL);
return;
}
@@ -294,14 +311,7 @@ start_service_cb (DBusGProxy * proxy, guint status, GError * error, gpointer use
}
/* Woot! it's running. Let's do it some more. */
- DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
- if (error != NULL) {
- g_error("Unable to get session bus for manager: %s", error->message);
- g_error_free(error);
- return;
- }
-
- priv->service_proxy = dbus_g_proxy_new_for_name_owner(session_bus,
+ priv->service_proxy = dbus_g_proxy_new_for_name_owner(priv->bus,
priv->name,
INDICATOR_SERVICE_OBJECT,
INDICATOR_SERVICE_INTERFACE,
@@ -317,16 +327,35 @@ start_service_cb (DBusGProxy * proxy, guint status, GError * error, gpointer use
static void
start_service (IndicatorServiceManager * service)
{
+ GError * error = NULL;
IndicatorServiceManagerPrivate * priv = INDICATOR_SERVICE_MANAGER_GET_PRIVATE(service);
g_return_if_fail(priv->dbus_proxy != NULL);
g_return_if_fail(priv->name != NULL);
- org_freedesktop_DBus_start_service_by_name_async (priv->dbus_proxy,
- priv->name,
- 0,
- start_service_cb,
- service);
+ /* Check to see if we can get a proxy to it first. */
+ priv->service_proxy = dbus_g_proxy_new_for_name_owner(priv->bus,
+ priv->name,
+ INDICATOR_SERVICE_OBJECT,
+ INDICATOR_SERVICE_INTERFACE,
+ &error);
+
+ if (error != NULL) {
+ /* We don't care about the error, just start the service anyway. */
+ g_error_free(error);
+ org_freedesktop_DBus_start_service_by_name_async (priv->dbus_proxy,
+ priv->name,
+ 0,
+ start_service_cb,
+ service);
+ } else {
+ /* If we got a proxy just because we're good people then
+ we need to call watch on it just like 'start_service_cb'
+ does. */
+ org_ayatana_indicator_service_watch_async(priv->service_proxy,
+ watch_cb,
+ service);
+ }
return;
}
diff --git a/libindicator/indicator-service.c b/libindicator/indicator-service.c
index 2ce5521..89842bb 100644
--- a/libindicator/indicator-service.c
+++ b/libindicator/indicator-service.c
@@ -8,6 +8,7 @@
/* DBus Prototypes */
static gboolean _indicator_service_server_watch (IndicatorService * service, DBusGMethodInvocation * method);
+static gboolean _indicator_service_server_un_watch (IndicatorService * service, DBusGMethodInvocation * method);
#include "indicator-service-server.h"
#include "dbus-shared.h"
@@ -327,6 +328,47 @@ _indicator_service_server_watch (IndicatorService * service, DBusGMethodInvocati
return TRUE;
}
+static gint
+find_watcher (gconstpointer a, gconstpointer b)
+{
+ return g_strcmp0((const gchar *)a, (const gchar *)b);
+}
+
+static gboolean
+_indicator_service_server_un_watch (IndicatorService * service, DBusGMethodInvocation * method)
+{
+ g_return_val_if_fail(INDICATOR_IS_SERVICE(service), FALSE);
+ 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);
+ if (watcher_item != NULL) {
+ /* Free the watcher */
+ gchar * name = watcher_item->data;
+ priv->watchers = g_list_remove(priv->watchers, name);
+ g_free(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));
+ }
+
+ /* If we're out of watchers set the timeout for shutdown */
+ if (priv->watchers == NULL) {
+ if (priv->timeout != 0) {
+ /* This should never really happen, but let's ensure that
+ bad things don't happen if it does. */
+ g_warning("No watchers timeout set twice. Resolving, but odd.");
+ g_source_remove(priv->timeout);
+ priv->timeout = 0;
+ }
+ /* If we don't get a new watcher quickly, we'll shutdown. */
+ priv->timeout = g_timeout_add(500, timeout_no_watchers, service);
+ }
+
+ dbus_g_method_return(method);
+ return TRUE;
+}
+
/* API */
/**
diff --git a/libindicator/indicator-service.xml b/libindicator/indicator-service.xml
index dc872e2..6bd7d80 100644
--- a/libindicator/indicator-service.xml
+++ b/libindicator/indicator-service.xml
@@ -10,6 +10,9 @@
<arg type="u" name="version" direction="out" />
<arg type="u" name="service_version" direction="out" />
</method>
+ <method name="UnWatch">
+ <annotation name="org.freedesktop.DBus.GLib.Async" value="true" />
+ </method>
<!-- Signals -->
<!-- None currently -->
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 23:56:36 +0000