aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-01-21 10:25:27 -0600
committerTed Gould <ted@gould.cx>2010-01-21 10:25:27 -0600
commit4a7af569bd96c25cbf028fd7144fd2f5d6262a3c (patch)
tree83adc6698ea61a5d774c6b65f97395558d94074d
parentc72ff4f03fb1fb7c28c2c8c5dda429dc12f45cd5 (diff)
downloadlibayatana-indicator-4a7af569bd96c25cbf028fd7144fd2f5d6262a3c.tar.gz
libayatana-indicator-4a7af569bd96c25cbf028fd7144fd2f5d6262a3c.tar.bz2
libayatana-indicator-4a7af569bd96c25cbf028fd7144fd2f5d6262a3c.zip
In case we're restarting because of the 'Watch' returning failure we'd have a valid 'service_proxy' object to kill
-rw-r--r--libindicator/indicator-service-manager.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libindicator/indicator-service-manager.c b/libindicator/indicator-service-manager.c
index a06e192..5d1bd91 100644
--- a/libindicator/indicator-service-manager.c
+++ b/libindicator/indicator-service-manager.c
@@ -411,6 +411,11 @@ start_service (IndicatorServiceManager * service)
g_return_if_fail(priv->dbus_proxy != NULL);
g_return_if_fail(priv->name != NULL);
+ if (priv->service_proxy != NULL) {
+ g_object_unref(priv->service_proxy);
+ priv->service_proxy = NULL;
+ }
+
/* 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,