appDisplay: Ignore the NoDisplay flag for directories

This makes us match the native app search.

https://bugzilla.gnome.org/show_bug.cgi?id=698486
This commit is contained in:
Jasper St. Pierre 2013-04-20 18:57:03 -04:00
parent 5d0d859a1f
commit 634a599db6

View File

@ -61,8 +61,7 @@ function _loadCategory(dir, view) {
view.addApp(app); view.addApp(app);
} else if (nextType == GMenu.TreeItemType.DIRECTORY) { } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
let itemDir = iter.get_directory(); let itemDir = iter.get_directory();
if (!itemDir.get_is_nodisplay()) _loadCategory(itemDir, view);
_loadCategory(itemDir, view);
} }
} }
}; };
@ -827,8 +826,6 @@ const AppDisplay = new Lang.Class({
while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) { while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
if (nextType == GMenu.TreeItemType.DIRECTORY) { if (nextType == GMenu.TreeItemType.DIRECTORY) {
let dir = iter.get_directory(); let dir = iter.get_directory();
if (dir.get_is_nodisplay())
continue;
if (folderCategories.indexOf(dir.get_menu_id()) != -1) if (folderCategories.indexOf(dir.get_menu_id()) != -1)
view.addFolder(dir); view.addFolder(dir);