diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-06 20:57:41 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-06 20:57:41 -0600 |
| commit | 05d072b4e78d6e4f5e4c9e85d01dc0d704c70d80 (patch) | |
| tree | d13a8a90d2840d851102379cf533138f943758f9 | |
| parent | 4b46daa3c4b95c301dc4a26112efc9a23777711e (diff) | |
| download | libayatana-appindicator-05d072b4e78d6e4f5e4c9e85d01dc0d704c70d80.tar.gz libayatana-appindicator-05d072b4e78d6e4f5e4c9e85d01dc0d704c70d80.tar.bz2 libayatana-appindicator-05d072b4e78d6e4f5e4c9e85d01dc0d704c70d80.zip | |
Changing what we're checking with the watcher, now that it's persistant more of the time we need to not block if it exists.
| -rw-r--r-- | src/app-indicator.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c index dc9fb47..5260f58 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1035,14 +1035,16 @@ check_connect (AppIndicator *self) /* Do we have a connection? */ if (priv->connection == NULL) return; - /* We're alreadying connecting or trying to connect. */ - if (priv->watcher_proxy != NULL) return; - - gchar * name = g_dbus_proxy_get_name_owner(priv->watcher_proxy); - if (name == NULL) { - return; + /* If we already have a proxy, let's see if it has someone + implementing it. If not, we can't do much more than to + do nothing. */ + if (priv->watcher_proxy != NULL) { + gchar * name = g_dbus_proxy_get_name_owner(priv->watcher_proxy); + if (name == NULL) { + return; + } + g_free(name); } - g_free(name); /* Do we have enough information? */ if (priv->menu == NULL) return; |