diff options
| author | Ted Gould <ted@gould.cx> | 2010-01-28 21:31:45 -0800 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-01-28 21:31:45 -0800 |
| commit | 1abf840d1c71c3aca0e4ec19a6c5c65a10da0413 (patch) | |
| tree | c34c1b264c305a5a84a780112e872aa7dd7875f0 | |
| parent | 52e1a43bd957bac1020d58134ab659553af7c4eb (diff) | |
| download | libayatana-indicator-1abf840d1c71c3aca0e4ec19a6c5c65a10da0413.tar.gz libayatana-indicator-1abf840d1c71c3aca0e4ec19a6c5c65a10da0413.tar.bz2 libayatana-indicator-1abf840d1c71c3aca0e4ec19a6c5c65a10da0413.zip | |
Error handling when building our proxies.
| -rw-r--r-- | libindicator/indicator-service-manager.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libindicator/indicator-service-manager.c b/libindicator/indicator-service-manager.c index 7bb9a9b..47765da 100644 --- a/libindicator/indicator-service-manager.c +++ b/libindicator/indicator-service-manager.c @@ -397,6 +397,15 @@ start_service_cb (DBusGProxy * proxy, guint status, GError * error, gpointer use INDICATOR_SERVICE_OBJECT, INDICATOR_SERVICE_INTERFACE, &error); + + if (error != NULL || priv->service_proxy == NULL) { + g_warning("Unable to create service proxy on '%s': %s", priv->name, error == NULL ? "(null)" : error->message); + priv->service_proxy = NULL; /* Should be already, but we want to be *really* sure. */ + g_error_free(error); + start_service_again(INDICATOR_SERVICE_MANAGER(user_data)); + return; + } + g_object_add_weak_pointer(G_OBJECT(priv->service_proxy), (gpointer *)&(priv->service_proxy)); g_signal_connect(G_OBJECT(priv->service_proxy), "destroy", G_CALLBACK(service_proxy_destroyed), user_data); @@ -432,7 +441,7 @@ start_service (IndicatorServiceManager * service) INDICATOR_SERVICE_INTERFACE, &error); - if (error != NULL) { + if (error != NULL || priv->service_proxy == 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, |