diff options
| author | Ted Gould <ted@gould.cx> | 2009-12-03 14:39:20 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-12-03 14:39:20 -0600 |
| commit | 8331ee5c19c33130e574a2c9785e6caad806dfe2 (patch) | |
| tree | 574d1085e109a29553758c2fb78df74fbf8ddb28 /libindicator | |
| parent | 436bca27a730090096c20637013a3905fe9f9055 (diff) | |
| download | libayatana-indicator-8331ee5c19c33130e574a2c9785e6caad806dfe2.tar.gz libayatana-indicator-8331ee5c19c33130e574a2c9785e6caad806dfe2.tar.bz2 libayatana-indicator-8331ee5c19c33130e574a2c9785e6caad806dfe2.zip | |
Switching unwatch to being a no_reply function call.
Diffstat (limited to 'libindicator')
| -rw-r--r-- | libindicator/indicator-service-manager.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libindicator/indicator-service-manager.c b/libindicator/indicator-service-manager.c index a3f76b2..db31aff 100644 --- a/libindicator/indicator-service-manager.c +++ b/libindicator/indicator-service-manager.c @@ -55,7 +55,6 @@ 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); @@ -163,7 +162,7 @@ indicator_service_manager_dispose (GObject *object) /* 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); + dbus_g_proxy_call_no_reply(priv->service_proxy, "UnWatch", G_TYPE_INVALID); } /* Destory our service proxy, we won't need it. */ @@ -259,12 +258,6 @@ 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); @@ -277,13 +270,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); + dbus_g_proxy_call_no_reply(priv->service_proxy, "UnWatch", G_TYPE_INVALID); 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); + dbus_g_proxy_call_no_reply(priv->service_proxy, "UnWatch", G_TYPE_INVALID); return; } |