aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-04-01 14:58:12 -0500
committerTed Gould <ted@gould.cx>2010-04-01 14:58:12 -0500
commitff63763f4f00d1c33a6557f3ea90dc26f7bc3c10 (patch)
treec60117e2f3076ffd71b338d28eb64dc10acaca14
parent5055af870eadff1cdd0f472298047514e25b3af0 (diff)
parentbf2c8f10f0bf8b18693f9987e420a87f8b060753 (diff)
downloadlibayatana-appindicator-ff63763f4f00d1c33a6557f3ea90dc26f7bc3c10.tar.gz
libayatana-appindicator-ff63763f4f00d1c33a6557f3ea90dc26f7bc3c10.tar.bz2
libayatana-appindicator-ff63763f4f00d1c33a6557f3ea90dc26f7bc3c10.zip
Making it so the timer doesn't get set if we're already in the fallback case.
-rw-r--r--src/libappindicator/app-indicator.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 11a9b1c..f82587e 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -768,6 +768,11 @@ start_fallback_timer (AppIndicator * self, gboolean disable_timeout)
return;
}
+ if (priv->status_icon != NULL) {
+ /* We're already fallen back. Let's not do it again. */
+ return;
+ }
+
if (priv->dbus_proxy == NULL) {
/* NOTE: Read the comment on setup_name_owner_proxy */
g_idle_add(setup_name_owner_proxy, self);