From f4c9af70e64c365e16326aa710af0f24e1a95d46 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Dec 2009 10:02:02 -0600 Subject: Only build a dbusmenu server if we don't have one. --- src/libappindicator/app-indicator.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 791f9ff..8efd3e2 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -754,8 +754,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; } /** -- cgit v1.2.3 From 6af83d4b37b68dd5b0cb6a60fc4dc363eb7eb3e3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Dec 2009 10:04:40 -0600 Subject: Initing 'menuservice' to NULL --- src/libappindicator/app-indicator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 8efd3e2..d0fcf04 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; -- cgit v1.2.3 From 09c4ec291659b21d6e64ce271ea818cb13ec259b Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Thu, 17 Dec 2009 17:27:03 +0100 Subject: Only create the dbusmenu server if it doesn't exist --- src/libappindicator/app-indicator.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 791f9ff..cb74a83 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -754,7 +754,9 @@ setup_dbusmenu (AppIndicator *self) container_iterate, root); - priv->menuservice = dbusmenu_server_new ("/need/a/menu/path"); + if (!priv->menuservice) + priv->menuservice = dbusmenu_server_new ("/need/a/menu/path"); + dbusmenu_server_set_root (priv->menuservice, root); } -- cgit v1.2.3