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

appFavorites: Only use renamed ID if it can be resolved

Browse Source 
We currently assume that if a .desktop file has been renamed (that
is, it is in our rename list), the updated ID will be used. That
assumption was mostly sound when the list contained only GNOME apps
following the same release cycle as gnome-shell, but as applications
with less ties to the GNOME schedule adopt the reverse DNS notation,
it becomes more likely for apps to appear in the list before actually
being updated on the system. Handle this case by only renaming IDs
for which the replacement can be resolved to an existing application.

https://bugzilla.gnome.org/show_bug.cgi?id=745626
This commit is contained in:
Florian Müllner 2015-03-04 19:01:32 +01:00
parent fa82af251f
commit 2c5bc4a1a9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/ui/appFavorites.js
View File

@ -59,12 +59,14 @@ const AppFavorites = new Lang.Class({
reload: function() { reload: function() {
let ids = global.settings.get_strv(this.FAVORITE_APPS_KEY); let ids = global.settings.get_strv(this.FAVORITE_APPS_KEY);
let appSys = Shell.AppSystem.get_default();
// Map old desktop file names to the current ones // Map old desktop file names to the current ones
let updated = false; let updated = false;
ids = ids.map(function (id) { ids = ids.map(function (id) {
let newId = RENAMED_DESKTOP_IDS[id]; let newId = RENAMED_DESKTOP_IDS[id];
if (newId !== undefined) { if (newId !== undefined &&
appSys.lookup_app(newId) != null) {
updated = true; updated = true;
return newId; return newId;
} }
@ -74,7 +76,6 @@ const AppFavorites = new Lang.Class({
if (updated) if (updated)
global.settings.set_strv(this.FAVORITE_APPS_KEY, ids); global.settings.set_strv(this.FAVORITE_APPS_KEY, ids);
let appSys = Shell.AppSystem.get_default();
let apps = ids.map(function (id) { let apps = ids.map(function (id) {
return appSys.lookup_app(id); return appSys.lookup_app(id);
}).filter(function (app) { }).filter(function (app) {