diff options
| author | Ted Gould <ted@canonical.com> | 2009-09-23 15:52:09 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-09-23 15:52:09 -0500 |
| commit | 258cbdd7cd723fac7b2ccbe069f12f89e03b059b (patch) | |
| tree | 8fd6298db9fb5c4756c5fe78fd97d7ed64c52fa0 | |
| parent | 8d9485c57e4e9ef10c6cc77ccf775c113f5f7d58 (diff) | |
| parent | ab65f0c528abb11dd7a822583a07c522963d9384 (diff) | |
| download | ayatana-indicator-messages-258cbdd7cd723fac7b2ccbe069f12f89e03b059b.tar.gz ayatana-indicator-messages-258cbdd7cd723fac7b2ccbe069f12f89e03b059b.tar.bz2 ayatana-indicator-messages-258cbdd7cd723fac7b2ccbe069f12f89e03b059b.zip | |
Merging in updated trunk
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/dirs.h | 3 | ||||
| -rw-r--r-- | src/launcher-menu-item.c | 4 | ||||
| -rw-r--r-- | src/messages-service.c | 6 |
4 files changed, 17 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 4fc46c8..afde5bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-messages (0.2.3-0ubuntu1~ppa2) UNRELEASED; urgency=low + + * Merging in updated trunk + + -- Ted Gould <ted@ubuntu.com> Wed, 23 Sep 2009 15:51:50 -0500 + indicator-messages (0.2.3-0ubuntu1~ppa1) karmic; urgency=low * Upstream release 0.2.3 @@ -1,3 +1,4 @@ -#define SYSTEM_APPS_DIR "/etc/indicators/messages/applications" +#define SYSTEM_APPS_DIR "/usr/share/indicators/messages/applications" +#define SYSTEM_APPS_DIR_OLD "/etc/indicators/messages/applications" #define USER_APPS_DIR "indicators/messages/applications" #define USER_BLACKLIST_DIR "indicators/messages/applications-blacklist" diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index 822196b..5afe7a9 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -137,6 +137,10 @@ launcher_menu_item_new (const gchar * desktop_file) g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL); + if (priv->appinfo == NULL) { + launcher_menu_item_set_eclipsed(self, TRUE); + } + return self; } diff --git a/src/messages-service.c b/src/messages-service.c index e37a721..1272355 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -1148,7 +1148,10 @@ build_launcher (gpointer data) dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->separator)); resort_menu(root_menuitem); - if (blacklist_check(launcher_menu_item_get_desktop(ll->menuitem))) { + /* If we're in the black list or we've gotten eclipsed + by something else, hide the item and the separator. */ + if (blacklist_check(launcher_menu_item_get_desktop(ll->menuitem)) || + launcher_menu_item_get_eclipsed(ll->menuitem)) { launcher_menu_item_set_eclipsed(ll->menuitem, TRUE); dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); } @@ -1244,6 +1247,7 @@ main (int argc, char ** argv) g_idle_add(blacklist_init, NULL); g_idle_add(build_launchers, SYSTEM_APPS_DIR); + g_idle_add(build_launchers, SYSTEM_APPS_DIR_OLD); gchar * userdir = g_build_filename(g_get_user_config_dir(), USER_APPS_DIR, NULL); g_idle_add(build_launchers, userdir); |