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

Check the type of GMenu items we get to avoid a crash

Browse Source 
We can't assume they're entries, and in this case they were
actually directories.
This commit is contained in:
Colin Walters 2009-04-08 10:54:27 -04:00
parent 3e33ee6481
commit df1e051207
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/shell-app-monitor.c
View File

@ -111,16 +111,27 @@ reread_menus (ShellAppMonitor *self)
for (iter = entries; iter; iter = iter->next) for (iter = entries; iter; iter = iter->next)
{ {
GMenuTreeEntry *entry = iter->data; GMenuTreeItem *item = iter->data;
ShellAppMenuEntry *shell_entry = g_new0 (ShellAppMenuEntry, 1);
shell_entry->name = g_strdup (gmenu_tree_entry_get_name (entry)); switch (gmenu_tree_item_get_type (item))
shell_entry->id = g_strdup (gmenu_tree_entry_get_desktop_file_id (entry)); {
shell_entry->icon = g_strdup (gmenu_tree_entry_get_icon (entry)); case GMENU_TREE_ITEM_DIRECTORY:
{
GMenuTreeDirectory *dir = iter->data;
ShellAppMenuEntry *shell_entry = g_new0 (ShellAppMenuEntry, 1);
priv->cached_menus = g_list_prepend (priv->cached_menus, shell_entry); shell_entry->name = g_strdup (gmenu_tree_directory_get_name (dir));
shell_entry->id = g_strdup (gmenu_tree_directory_get_menu_id (dir));
shell_entry->icon = g_strdup (gmenu_tree_directory_get_icon (dir));
gmenu_tree_item_unref (entry); priv->cached_menus = g_list_prepend (priv->cached_menus, shell_entry);
gmenu_tree_item_unref (dir);
}
break;
default:
break;
}
} }
priv->cached_menus = g_list_reverse (priv->cached_menus); priv->cached_menus = g_list_reverse (priv->cached_menus);