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

app-system: Remove lookup_app_by_tree_entry

Browse Source 
We want to move away from gnome-menus eventually, so the simple
utility method isn't really worth keeping around. Reimplement it
in the one place that uses it.

https://bugzilla.gnome.org/show_bug.cgi?id=698486
This commit is contained in:
Jasper St. Pierre 2013-02-08 22:54:50 -05:00
parent 8737b06559
commit f165cc23c0
3 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/ui/appDisplay.js
View File

@ -55,8 +55,9 @@ function _loadCategory(dir, view) {
while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) { while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
if (nextType == GMenu.TreeItemType.ENTRY) { if (nextType == GMenu.TreeItemType.ENTRY) {
let entry = iter.get_entry(); let entry = iter.get_entry();
let app = appSystem.lookup_app_by_tree_entry(entry); let appInfo = entry.get_app_info();
if (!entry.get_app_info().get_nodisplay()) let app = appSystem.lookup_app(entry.get_desktop_file_id());
if (appInfo.should_show())
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();

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

@ -449,25 +449,6 @@ shell_app_system_lookup_app (ShellAppSystem *self,
return g_hash_table_lookup (self->priv->id_to_app, id); return g_hash_table_lookup (self->priv->id_to_app, id);
} }
/**
* shell_app_system_lookup_app_by_tree_entry:
* @system: a #ShellAppSystem
* @entry: a #GMenuTreeEntry
*
* Find a #ShellApp corresponding to a #GMenuTreeEntry.
*
* Return value: (transfer none): The #ShellApp for @entry, or %NULL if none
*/
ShellApp *
shell_app_system_lookup_app_by_tree_entry (ShellAppSystem *self,
GMenuTreeEntry *entry)
{
/* If we looked up directly in ->entry_to_app, we'd lose the
* override of running apps. Thus, indirect through the id.
*/
return shell_app_system_lookup_app (self, gmenu_tree_entry_get_desktop_file_id (entry));
}
/** /**
* shell_app_system_lookup_app_for_path: * shell_app_system_lookup_app_for_path:
* @system: a #ShellAppSystem * @system: a #ShellAppSystem

2
src/shell-app-system.h
View File

@ -43,8 +43,6 @@ GMenuTree *shell_app_system_get_tree (ShellAppSystem *s
ShellApp *shell_app_system_lookup_app (ShellAppSystem *system, ShellApp *shell_app_system_lookup_app (ShellAppSystem *system,
const char *id); const char *id);
ShellApp *shell_app_system_lookup_app_by_tree_entry (ShellAppSystem *system,
GMenuTreeEntry *entry);
ShellApp *shell_app_system_lookup_app_for_path (ShellAppSystem *system, ShellApp *shell_app_system_lookup_app_for_path (ShellAppSystem *system,
const char *desktop_path); const char *desktop_path);
ShellApp *shell_app_system_lookup_heuristic_basename (ShellAppSystem *system, ShellApp *shell_app_system_lookup_heuristic_basename (ShellAppSystem *system,