aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-04-01 11:26:22 -0500
committerTed Gould <ted@gould.cx>2010-04-01 11:26:22 -0500
commitd6bb68c1ba7e9c0d3cfe1f7f4aeeacd01f3af55b (patch)
treefce1350e078d891de0796842b1489274ee1341ef
parentd3026a23f611f1790d8c9dc2e49a50217f1fe5aa (diff)
downloadayatana-indicator-application-d6bb68c1ba7e9c0d3cfe1f7f4aeeacd01f3af55b.tar.gz
ayatana-indicator-application-d6bb68c1ba7e9c0d3cfe1f7f4aeeacd01f3af55b.tar.bz2
ayatana-indicator-application-d6bb68c1ba7e9c0d3cfe1f7f4aeeacd01f3af55b.zip
No timer if we're already in fallback.
-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 4076334..d7c8a8d 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -781,6 +781,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);