diff --git a/debian/changelog b/debian/changelog index e004d30..de3dda0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cinnamon-menus (4.6.1) ulyana; urgency=medium + + [ Michael Webster ] + * debian/rules: Don't disable debugging. + * gmenu-tree.c: Return a basename if no appinfo is available when sorting. + + -- Clement Lefebvre Wed, 24 Jun 2020 13:44:23 +0100 + cinnamon-menus (4.6.0) ulyana; urgency=medium * 4.6.0 diff --git a/debian/rules b/debian/rules index e1e35e7..71e90a4 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ --prefix=/usr \ --buildtype=plain \ -D deprecated_warnings=false \ - -D enable_debug=false \ -D enable_docs=true override_dh_auto_clean: diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c index 2b69255..b6c5f97 100644 --- a/libmenu/gmenu-tree.c +++ b/libmenu/gmenu-tree.c @@ -1779,6 +1779,11 @@ break; case GMENU_TREE_ITEM_ENTRY: + if (gmenu_tree_entry_get_app_info (GMENU_TREE_ENTRY (item)) == NULL) + { + return desktop_entry_get_basename (GMENU_TREE_ENTRY (item)->desktop_entry); + } + if (flags & GMENU_TREE_FLAGS_SORT_DISPLAY_NAME) name = g_app_info_get_display_name (G_APP_INFO (gmenu_tree_entry_get_app_info (GMENU_TREE_ENTRY (item)))); else diff --git a/meson.build b/meson.build index 4a21c4d..160bbd5 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('cinnamon-menus', 'c', version : '4.6.0', meson_version: '>=0.40.0') +project('cinnamon-menus', 'c', version : '4.6.1', meson_version: '>=0.40.0') gnome = import('gnome')