aboutsummaryrefslogtreecommitdiff
path: root/src/libappindicator
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2009-12-17 15:30:39 -0500
committerKen VanDine <ken.vandine@canonical.com>2009-12-17 15:30:39 -0500
commit4e8176ec1b9f95dbe4d7a85eb253677434b2effd (patch)
tree63b65d66eb8a5939a03b48d128cff98e3b22adc4 /src/libappindicator
parentc64d79b378ef28b99f7e934d54b4e129f1836e1b (diff)
parentd1fbd5d1155d220b808d59a85ab69d46df4449b4 (diff)
downloadayatana-indicator-application-4e8176ec1b9f95dbe4d7a85eb253677434b2effd.tar.gz
ayatana-indicator-application-4e8176ec1b9f95dbe4d7a85eb253677434b2effd.tar.bz2
ayatana-indicator-application-4e8176ec1b9f95dbe4d7a85eb253677434b2effd.zip
merged
Diffstat (limited to 'src/libappindicator')
-rw-r--r--src/libappindicator/app-indicator.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 791f9ff..bb68cb2 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -278,6 +278,7 @@ app_indicator_init (AppIndicator *self)
priv->icon_name = NULL;
priv->attention_icon_name = NULL;
priv->menu = NULL;
+ priv->menuservice = NULL;
priv->watcher_proxy = NULL;
priv->connection = NULL;
@@ -754,8 +755,13 @@ setup_dbusmenu (AppIndicator *self)
container_iterate,
root);
- priv->menuservice = dbusmenu_server_new ("/need/a/menu/path");
+ if (priv->menuservice == NULL) {
+ priv->menuservice = dbusmenu_server_new ("/need/a/menu/path");
+ }
+
dbusmenu_server_set_root (priv->menuservice, root);
+
+ return;
}
/**