Compare commits

..

2 Commits

Author SHA1 Message Date
Florian Müllner
15080613bc Bump version to 3.18.4
Update NEWS.
2016-03-03 17:47:18 +01:00
Florian Müllner
2383462a60 apps-menu: Catch menu tree entries we can't resolve to an app
The default .menu file still contains a number of legacy directories that
have been deprecated for over 15 years, which GIO (and in extension the
shell's AppSystem) ignore. Encountering such an entry currently triggers
an exception and an entire category ends up empty, fix this by silently
skipping over the offending entry.

https://bugzilla.gnome.org/show_bug.cgi?id=759004
2016-03-03 17:42:24 +01:00
3 changed files with 6 additions and 2 deletions

4
NEWS
View File

@@ -1,3 +1,7 @@
3.18.4
======
* apps-menu: Ignore .desktop entries from legacy dirs
3.18.3
======
* apps-menu: Fix .desktop entries in subdirectories

View File

@@ -1,5 +1,5 @@
AC_PREREQ(2.63)
AC_INIT([gnome-shell-extensions],[3.18.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
AC_INIT([gnome-shell-extensions],[3.18.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([config])

View File

@@ -404,7 +404,7 @@ const ApplicationsButton = new Lang.Class({
continue;
}
let app = appSys.lookup_app(id);
if (app.get_app_info().should_show())
if (app && app.get_app_info().should_show())
this.applicationsByCategory[categoryId].push(app);
} else if (nextType == GMenu.TreeItemType.DIRECTORY) {
let subdir = iter.get_directory();