diff options
| author | Ted Gould <ted@gould.cx> | 2009-12-17 10:38:25 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-12-17 10:38:25 -0600 |
| commit | bdff04c7d2027327e071b63f1c1d2740e9795364 (patch) | |
| tree | 0a60ebf93fadb87eb12c178d8088959b38538db2 | |
| parent | e2f12574cb3d966747f2d08a5e8407657bc5a43e (diff) | |
| parent | d11b8c94043a2b54db555b6151f16c57ada2eba9 (diff) | |
| download | ayatana-indicator-application-bdff04c7d2027327e071b63f1c1d2740e9795364.tar.gz ayatana-indicator-application-bdff04c7d2027327e071b63f1c1d2740e9795364.tar.bz2 ayatana-indicator-application-bdff04c7d2027327e071b63f1c1d2740e9795364.zip | |
* Upstream updates:
* Fixing when menus are set twice. (LP: #497812)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/libappindicator/app-indicator.c | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 4284c67..444d137 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.4-0ubuntu3~ppa4) UNRELEASED; urgency=low + + * Upstream updates: + * Fixing when menus are set twice. (LP: #497812) + + -- Ted Gould <ted@ubuntu.com> Thu, 17 Dec 2009 10:37:30 -0600 + indicator-application (0.0.4-0ubuntu3~ppa3) karmic; urgency=low * debian/control: Removing architecture independent build 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; } /** |