From 39e31a3aa99832e582353c9639881fd719b78f36 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 30 Jun 2009 14:48:07 -0400 Subject: [PATCH] Update for comments on b5988a57fa602ad5c02abe69efa2f66a1646e581 --- data/gnome-shell.schemas | 2 +- js/ui/appDisplay.js | 14 ++--- src/shell-app-monitor.c | 8 +-- src/shell-app-system.c | 108 +++++++++++++++++++++++++-------------- src/shell-app-system.h | 3 +- 5 files changed, 84 insertions(+), 51 deletions(-) diff --git a/data/gnome-shell.schemas b/data/gnome-shell.schemas index 0ee735ed0..6dc06c48a 100644 --- a/data/gnome-shell.schemas +++ b/data/gnome-shell.schemas @@ -16,7 +16,7 @@ - /schemas/desktop/gnome/favorite_apps + /schemas/desktop/gnome/shell/favorite_apps /desktop/gnome/shell/favorite_apps gnome-shell list diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index 084f8183a..93d330485 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -183,16 +183,15 @@ AppDisplay.prototype = { this._appMonitor = Shell.AppMonitor.get_default(); this._appSystem = Shell.AppSystem.get_default(); this._appsStale = true; - this._appSystem.connect('changed', Lang.bind(this, function(appSys) { + this._appSystem.connect('installed-changed', Lang.bind(this, function(appSys) { this._appsStale = true; - // We still need to determine what events other than search can trigger - // a change in the set of applications that are being shown while the - // user in in the overlay mode, however let's redisplay just in case. this._redisplay(false); this._redisplayMenus(); })); + this._appSystem.connect('favorites-changed', Lang.bind(this, function(appSys) { + this._redisplay(false); + })); this._appMonitor.connect('changed', Lang.bind(this, function(monitor) { - this._appsStale = true; this._redisplay(false); })); @@ -574,7 +573,10 @@ AppWell.prototype = { this._appSystem = Shell.AppSystem.get_default(); this._appMonitor = Shell.AppMonitor.get_default(); - this._appSystem.connect('changed', Lang.bind(this, function(appSys) { + this._appSystem.connect('installed-changed', Lang.bind(this, function(appSys) { + this._redisplay(); + })); + this._appSystem.connect('favorites-changed', Lang.bind(this, function(appSys) { this._redisplay(); })); this._appMonitor.connect('changed', Lang.bind(this, function(monitor) { diff --git a/src/shell-app-monitor.c b/src/shell-app-monitor.c index aed794a69..cfa32f612 100644 --- a/src/shell-app-monitor.c +++ b/src/shell-app-monitor.c @@ -279,7 +279,7 @@ get_appid_for_window (MetaWindow *window) { char *wmclass; char *with_desktop; - char *fullpath; + char *result; ShellAppSystem *appsys; wmclass = get_cleaned_wmclass_for_window (window); @@ -291,10 +291,10 @@ get_appid_for_window (MetaWindow *window) g_free (wmclass); appsys = shell_app_system_get_default (); + result = shell_app_system_lookup_basename (appsys, with_desktop); + g_free (with_desktop); - fullpath = shell_app_system_lookup_basename (appsys, with_desktop); - - return fullpath; + return result; } static void diff --git a/src/shell-app-system.c b/src/shell-app-system.c index 89f1e5890..6e7bfb0a7 100644 --- a/src/shell-app-system.c +++ b/src/shell-app-system.c @@ -18,7 +18,8 @@ enum { }; enum { - CHANGED, + INSTALLED_CHANGED, + FAVORITES_CHANGED, LAST_SIGNAL }; @@ -74,14 +75,22 @@ static void shell_app_system_class_init(ShellAppSystemClass *klass) gobject_class->finalize = shell_app_system_finalize; - signals[CHANGED] = - g_signal_new ("changed", + signals[INSTALLED_CHANGED] = + g_signal_new ("installed-changed", SHELL_TYPE_APP_SYSTEM, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ShellAppSystemClass, changed), + G_STRUCT_OFFSET (ShellAppSystemClass, installed_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + signals[FAVORITES_CHANGED] = + g_signal_new ("favorites-changed", + SHELL_TYPE_APP_SYSTEM, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (ShellAppSystemClass, favorites_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); g_type_class_add_private (gobject_class, sizeof (ShellAppSystemPrivate)); } @@ -254,7 +263,7 @@ on_tree_changed (GMenuTree *monitor, gpointer user_data) { ShellAppSystem *self = SHELL_APP_SYSTEM (user_data); - g_signal_emit (self, signals[CHANGED], 0); + g_signal_emit (self, signals[INSTALLED_CHANGED], 0); reread_menus (self); } @@ -284,7 +293,7 @@ reread_favorite_apps (ShellAppSystem *system) GConfClient *client = gconf_client_get_default (); GConfValue *val; - val = gconf_client_get (client, "/desktop/gnome/shell/favorite_apps", NULL); + val = gconf_client_get (client, SHELL_APP_FAVORITES_KEY, NULL); if (!(val && val->type == GCONF_VALUE_LIST && gconf_value_get_list_type (val) == GCONF_VALUE_STRING)) return; @@ -296,11 +305,14 @@ reread_favorite_apps (ShellAppSystem *system) } void -on_favorite_apps_changed (GConfClient *client, guint id, GConfEntry *entry, gpointer user_data) +on_favorite_apps_changed (GConfClient *client, + guint id, + GConfEntry *entry, + gpointer user_data) { ShellAppSystem *system = SHELL_APP_SYSTEM (user_data); reread_favorite_apps (system); - g_signal_emit (G_OBJECT (system), signals[CHANGED], 0); + g_signal_emit (G_OBJECT (system), signals[FAVORITES_CHANGED], 0); } GType @@ -392,7 +404,7 @@ shell_app_system_get_default () * Return the list of applications which have been explicitly added to the * favorites. * - * Return value: (transfer none) (element-type utf8): List of favorite application ids + * Return value: (transfer container) (element-type utf8): List of favorite application ids */ GList * shell_app_system_get_favorites (ShellAppSystem *system) @@ -424,13 +436,16 @@ shell_app_system_add_favorite (ShellAppSystem *system, const char *id) { GConfClient *client = gconf_client_get_default (); GConfValue *val; + GList *favorites; val = gconf_value_new (GCONF_VALUE_LIST); gconf_value_set_list_type (val, GCONF_VALUE_STRING); g_hash_table_insert (system->priv->cached_favorites, g_strdup (id), GUINT_TO_POINTER (1)); - set_gconf_value_string_list (val, g_hash_table_get_keys (system->priv->cached_favorites)); + favorites = g_hash_table_get_keys (system->priv->cached_favorites); + set_gconf_value_string_list (val, favorites); + g_list_free (favorites); gconf_client_set (client, SHELL_APP_FAVORITES_KEY, val, NULL); } @@ -440,6 +455,7 @@ shell_app_system_remove_favorite (ShellAppSystem *system, const char *id) { GConfClient *client = gconf_client_get_default (); GConfValue *val; + GList *favorites; if (!g_hash_table_remove (system->priv->cached_favorites, id)) return; @@ -447,18 +463,19 @@ shell_app_system_remove_favorite (ShellAppSystem *system, const char *id) val = gconf_value_new (GCONF_VALUE_LIST); gconf_value_set_list_type (val, GCONF_VALUE_STRING); - set_gconf_value_string_list (val, g_hash_table_get_keys (system->priv->cached_favorites)); + favorites = g_hash_table_get_keys (system->priv->cached_favorites); + set_gconf_value_string_list (val, favorites); + g_list_free (favorites); gconf_client_set (client, SHELL_APP_FAVORITES_KEY, val, NULL); } - -static char * -full_path_for_id (ShellAppSystem *system, - const char *target_id, - GMenuTreeDirectory *root) +static gboolean +desktop_id_exists (ShellAppSystem *system, + const char *target_id, + GMenuTreeDirectory *root) { - char *ret = NULL; + gboolean found = FALSE; GSList *contents, *iter; contents = gmenu_tree_directory_get_contents (root); @@ -467,7 +484,7 @@ full_path_for_id (ShellAppSystem *system, { GMenuTreeItem *item = iter->data; - if (ret != NULL) + if (found) break; switch (gmenu_tree_item_get_type (item)) @@ -477,15 +494,13 @@ full_path_for_id (ShellAppSystem *system, GMenuTreeEntry *entry = (GMenuTreeEntry *)item; const char *id = gmenu_tree_entry_get_desktop_file_id (entry); if (strcmp (id, target_id) == 0) - { - ret = g_strdup (gmenu_tree_entry_get_desktop_file_path (entry)); - } + found = TRUE; } break; case GMENU_TREE_ITEM_DIRECTORY: { GMenuTreeDirectory *dir = (GMenuTreeDirectory*)item; - ret = full_path_for_id (system, target_id, dir); + found = desktop_id_exists (system, target_id, dir); } break; default: @@ -494,33 +509,48 @@ full_path_for_id (ShellAppSystem *system, gmenu_tree_item_unref (item); } - return ret; + g_slist_free (contents); + + return found; } +/** + * shell_app_system_lookup_basename: + * @name: Probable application identifier + * + * Determine whether a valid .desktop file ID corresponding to a given + * heuristically determined application identifier + * string. + */ char * shell_app_system_lookup_basename (ShellAppSystem *system, - const char *id) + const char *name) { GMenuTreeDirectory *root; - char *path; - char *tmpid; + char *result; root = gmenu_tree_get_directory_from_path (system->priv->apps_tree, "/"); g_assert (root != NULL); - path = full_path_for_id (system, id, root); - if (path != NULL) - return path; + if (desktop_id_exists (system, name, root)) + { + result = g_strdup (name); + goto out; + } - tmpid = g_strjoin ("", "gnome-", id, NULL); - path = full_path_for_id (system, tmpid, root); - g_free (tmpid); - if (path != NULL) - return path; + /* These are common "vendor prefixes". But using + * WM_CLASS as a source, we don't get the vendor + * prefix. So try stripping them. + */ + result = g_strjoin ("", "gnome-", name, NULL); + if (desktop_id_exists (system, result, root)) + goto out; - tmpid = g_strjoin ("", "fedora-", id, NULL); - path = full_path_for_id (system, tmpid, root); - g_free (tmpid); + result = g_strjoin ("", "fedora-", name, NULL); + if (desktop_id_exists (system, result, root)) + goto out; - return path; -} \ No newline at end of file +out: + gmenu_tree_item_unref (root); + return result; +} diff --git a/src/shell-app-system.h b/src/shell-app-system.h index 1725aa0b6..450de2978 100644 --- a/src/shell-app-system.h +++ b/src/shell-app-system.h @@ -25,7 +25,8 @@ struct _ShellAppSystemClass { GObjectClass parent_class; - void (*changed)(ShellAppSystem *appsys, gpointer data); + void (*installed_changed)(ShellAppSystem *appsys, gpointer user_data); + void (*favorites_changed)(ShellAppSystem *appsys, gpointer user_data); }; GType shell_app_system_get_type (void) G_GNUC_CONST;