isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recursively flatten menus

Browse Source 
This is a quick-fix which at least shows entries from nested
menus such as Wine.  It also enables us to load "settings.menu".
This commit is contained in:
Colin Walters 2009-05-14 13:03:18 -04:00
parent deaf0e4e1a
commit ff7940b87f
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/shell-app-system.c
View File

@ -166,27 +166,15 @@ shell_app_menu_entry_get_type (void)
return gtype; return gtype;
} }
/** static GList *
* shell_app_system_get_applications_for_menu: gather_entries_recurse (ShellAppSystem *monitor,
* GList *ids,
* Return value: (transfer full) (element-type utf8): List of desktop file ids GMenuTreeDirectory *root)
*/
GList *
shell_app_system_get_applications_for_menu (ShellAppSystem *monitor,
const char *menu)
{ {
GList *ret = NULL;
GSList *contents; GSList *contents;
GSList *iter; GSList *iter;
char *path;
GMenuTreeDirectory *menu_entry;
path = g_strdup_printf ("/%s", menu); contents = gmenu_tree_directory_get_contents (root);
menu_entry = gmenu_tree_get_directory_from_path (monitor->priv->tree, path);
g_free (path);
g_assert (menu_entry != NULL);
contents = gmenu_tree_directory_get_contents (menu_entry);
for (iter = contents; iter; iter = iter->next) for (iter = contents; iter; iter = iter->next)
{ {
@ -197,7 +185,13 @@ shell_app_system_get_applications_for_menu (ShellAppSystem *monitor,
{ {
GMenuTreeEntry *entry = (GMenuTreeEntry *)item; GMenuTreeEntry *entry = (GMenuTreeEntry *)item;
const char *id = gmenu_tree_entry_get_desktop_file_id (entry); const char *id = gmenu_tree_entry_get_desktop_file_id (entry);
ret = g_list_prepend (ret, g_strdup (id)); ids = g_list_prepend (ids, g_strdup (id));
}
break;
case GMENU_TREE_ITEM_DIRECTORY:
{
GMenuTreeDirectory *dir = (GMenuTreeDirectory*)item;
ids = gather_entries_recurse (monitor, ids, dir);
} }
break; break;
default: default:
@ -205,9 +199,30 @@ shell_app_system_get_applications_for_menu (ShellAppSystem *monitor,
} }
gmenu_tree_item_unref (item); gmenu_tree_item_unref (item);
} }
g_slist_free (contents); g_slist_free (contents);
return ret; return ids;
}
/**
* shell_app_system_get_applications_for_menu:
*
* Return value: (transfer full) (element-type utf8): List of desktop file ids
*/
GList *
shell_app_system_get_applications_for_menu (ShellAppSystem *monitor,
const char *menu)
{
char *path;
GMenuTreeDirectory *menu_entry;
path = g_strdup_printf ("/%s", menu);
menu_entry = gmenu_tree_get_directory_from_path (monitor->priv->tree, path);
g_free (path);
g_assert (menu_entry != NULL);
return gather_entries_recurse (monitor, NULL, menu_entry);
} }
/** /**