r35414 - in /desktop/unstable/gnome-menus/debian: changelog libgnome-menu-3-0.symbols patches/61_nodisplay_recurse.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Jun 23 18:28:23 UTC 2012
Author: joss
Date: Sat Jun 23 18:28:23 2012
New Revision: 35414
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35414
Log:
* 61_nodisplay_recurse.patch: backported from upstream git. Add a
function to check for NoDisplay=true recursively. This is needed for
gnome-shell.
* Update symbols file accordingly.
Added:
desktop/unstable/gnome-menus/debian/patches/61_nodisplay_recurse.patch
Modified:
desktop/unstable/gnome-menus/debian/changelog
desktop/unstable/gnome-menus/debian/libgnome-menu-3-0.symbols
desktop/unstable/gnome-menus/debian/patches/series
Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=35414&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/changelog [utf-8] Sat Jun 23 18:28:23 2012
@@ -1,3 +1,12 @@
+gnome-menus (3.4.2-3) unstable; urgency=low
+
+ * 61_nodisplay_recurse.patch: backported from upstream git. Add a
+ function to check for NoDisplay=true recursively. This is needed for
+ gnome-shell.
+ * Update symbols file accordingly.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 23 Jun 2012 20:28:18 +0200
+
gnome-menus (3.4.2-2) unstable; urgency=low
* Blacklist imagemagick. Closes: #678406.
Modified: desktop/unstable/gnome-menus/debian/libgnome-menu-3-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/libgnome-menu-3-0.symbols?rev=35414&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/libgnome-menu-3-0.symbols [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/libgnome-menu-3-0.symbols [utf-8] Sat Jun 23 18:28:23 2012
@@ -19,6 +19,7 @@
gmenu_tree_entry_get_desktop_file_id at Base 3.2.0.1
gmenu_tree_entry_get_desktop_file_path at Base 3.2.0.1
gmenu_tree_entry_get_is_excluded at Base 3.2.0.1
+ gmenu_tree_entry_get_is_nodisplay_recurse at Base 3.4.2-3~
gmenu_tree_entry_get_parent at Base 3.2.0.1
gmenu_tree_entry_get_type at Base 3.2.0.1
gmenu_tree_flags_get_type at Base 3.2.0.1
Added: desktop/unstable/gnome-menus/debian/patches/61_nodisplay_recurse.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/61_nodisplay_recurse.patch?rev=35414&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/61_nodisplay_recurse.patch (added)
+++ desktop/unstable/gnome-menus/debian/patches/61_nodisplay_recurse.patch [utf-8] Sat Jun 23 18:28:23 2012
@@ -1,0 +1,108 @@
+From ade49e7f07ef6cb0168002f6c12a4be6c1bdbee8 Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre at mecheye.net>
+Date: Mon, 18 Jun 2012 22:08:26 +0000
+Subject: libmenu: Add a way to grab NoDisplay on an item and all of its parents
+
+Some applications may want a way to show or hide a tree entry based on
+its visibility in the actual tree.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=678419
+---
+diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
+index 688e8af..53f5e1e 100644
+--- a/libmenu/gmenu-tree.c
++++ b/libmenu/gmenu-tree.c
+@@ -128,7 +128,6 @@ struct GMenuTreeEntry
+ char *desktop_file_id;
+
+ guint is_excluded : 1;
+- guint is_nodisplay : 1;
+ guint is_unallocated : 1;
+ };
+
+@@ -1221,6 +1220,31 @@ gmenu_tree_entry_get_desktop_file_id (GMenuTreeEntry *entry)
+ }
+
+ gboolean
++gmenu_tree_entry_get_is_nodisplay_recurse (GMenuTreeEntry *entry)
++{
++ GMenuTreeDirectory *directory;
++ GDesktopAppInfo *app_info;
++
++ g_return_val_if_fail (entry != NULL, FALSE);
++
++ app_info = gmenu_tree_entry_get_app_info (entry);
++
++ if (g_desktop_app_info_get_nodisplay (app_info))
++ return TRUE;
++
++ directory = entry->item.parent;
++ while (directory != NULL)
++ {
++ if (directory->is_nodisplay)
++ return TRUE;
++
++ directory = directory->item.parent;
++ }
++
++ return FALSE;
++}
++
++gboolean
+ gmenu_tree_entry_get_is_excluded (GMenuTreeEntry *entry)
+ {
+ g_return_val_if_fail (entry != NULL, FALSE);
+@@ -1542,7 +1566,6 @@ gmenu_tree_entry_new (GMenuTreeDirectory *parent,
+ DesktopEntry *desktop_entry,
+ const char *desktop_file_id,
+ gboolean is_excluded,
+- gboolean is_nodisplay,
+ gboolean is_unallocated)
+ {
+ GMenuTreeEntry *retval;
+@@ -1557,7 +1580,6 @@ gmenu_tree_entry_new (GMenuTreeDirectory *parent,
+ retval->desktop_entry = desktop_entry_ref (desktop_entry);
+ retval->desktop_file_id = g_strdup (desktop_file_id);
+ retval->is_excluded = is_excluded != FALSE;
+- retval->is_nodisplay = is_nodisplay != FALSE;
+ retval->is_unallocated = is_unallocated != FALSE;
+
+ return retval;
+@@ -3260,7 +3282,6 @@ entries_listify_foreach (const char *desktop_file_id,
+ desktop_entry,
+ desktop_file_id,
+ FALSE,
+- desktop_entry_get_no_display (desktop_entry),
+ FALSE));
+ }
+
+@@ -3275,7 +3296,6 @@ excluded_entries_listify_foreach (const char *desktop_file_id,
+ desktop_entry,
+ desktop_file_id,
+ TRUE,
+- desktop_entry_get_no_display (desktop_entry),
+ FALSE));
+ }
+
+@@ -3290,7 +3310,6 @@ unallocated_entries_listify_foreach (const char *desktop_file_id,
+ desktop_entry,
+ desktop_file_id,
+ FALSE,
+- desktop_entry_get_no_display (desktop_entry),
+ TRUE));
+ }
+
+diff --git a/libmenu/gmenu-tree.h b/libmenu/gmenu-tree.h
+index 06e653e..db25572 100644
+--- a/libmenu/gmenu-tree.h
++++ b/libmenu/gmenu-tree.h
+@@ -139,6 +139,7 @@ GMenuTree *gmenu_tree_entry_get_tree (GMenuTreeEntry *entry);
+ const char *gmenu_tree_entry_get_desktop_file_path (GMenuTreeEntry *entry);
+ const char *gmenu_tree_entry_get_desktop_file_id (GMenuTreeEntry *entry);
+
++gboolean gmenu_tree_entry_get_is_nodisplay_recurse (GMenuTreeEntry *entry);
+ gboolean gmenu_tree_entry_get_is_excluded (GMenuTreeEntry *entry);
+ gboolean gmenu_tree_entry_get_is_unallocated (GMenuTreeEntry *entry);
+
+--
+cgit v0.9.0.2
Modified: desktop/unstable/gnome-menus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/series?rev=35414&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/patches/series [utf-8] Sat Jun 23 18:28:23 2012
@@ -8,3 +8,4 @@
11_science-menu.patch
21_default-python-in-shebang.patch
60_missing_function.patch
+61_nodisplay_recurse.patch
More information about the pkg-gnome-commits
mailing list