From 4f1a8334b9f819d24dfed202ef6c7d6da272848d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 23 Sep 2009 11:11:52 -0500 Subject: Looking at the old system apps directory as well. --- src/messages-service.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/messages-service.c') diff --git a/src/messages-service.c b/src/messages-service.c index e37a721..1a2fa82 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -1244,6 +1244,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); -- cgit v1.2.3 From eddfb1cec5a4a6d5b8674c102a72edbb9fcf37ec Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 23 Sep 2009 11:48:09 -0500 Subject: If we're not given a valid desktop file we should eclipse ourselves, and if we're eclipsed, we should hide the separator as well. --- src/messages-service.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/messages-service.c') diff --git a/src/messages-service.c b/src/messages-service.c index 1a2fa82..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"); } -- cgit v1.2.3