r35415 - /desktop/unstable/gnome-menus/debian/patches/61_nodisplay_recurse.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jun 23 18:36:33 2012
New Revision: 35415

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35415
Log:
Refresh the patch

Modified:
    desktop/unstable/gnome-menus/debian/patches/61_nodisplay_recurse.patch

Modified: 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=35415&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/61_nodisplay_recurse.patch [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/patches/61_nodisplay_recurse.patch [utf-8] Sat Jun 23 18:36:33 2012
@@ -8,19 +8,19 @@
 
 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
+Index: gnome-menus-3.4.2/libmenu/gmenu-tree.c
+===================================================================
+--- gnome-menus-3.4.2.orig/libmenu/gmenu-tree.c	2012-06-23 20:28:56.000000000 +0200
++++ gnome-menus-3.4.2/libmenu/gmenu-tree.c	2012-06-23 20:35:34.747979852 +0200
+@@ -127,7 +127,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)
+ struct GMenuTreeSeparator
+@@ -1210,6 +1209,31 @@ gmenu_tree_entry_get_desktop_file_id (GM
  }
  
  gboolean
@@ -52,57 +52,53 @@
  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,
+@@ -1453,8 +1477,7 @@ static GMenuTreeEntry *
+ gmenu_tree_entry_new (GMenuTreeDirectory *parent,
  		      DesktopEntry       *desktop_entry,
  		      const char         *desktop_file_id,
- 		      gboolean            is_excluded,
--                      gboolean            is_nodisplay,
-                       gboolean            is_unallocated)
+-		      gboolean            is_excluded,
+-                      gboolean            is_nodisplay)
++		      gboolean            is_excluded)
  {
    GMenuTreeEntry *retval;
-@@ -1557,7 +1580,6 @@ gmenu_tree_entry_new (GMenuTreeDirectory *parent,
+ 
+@@ -1467,7 +1490,6 @@ gmenu_tree_entry_new (GMenuTreeDirectory
    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,
+ }
+@@ -3165,8 +3187,7 @@ entries_listify_foreach (const char
+ 		     gmenu_tree_entry_new (directory,
                                             desktop_entry,
                                             desktop_file_id,
-                                            FALSE,
--                                           desktop_entry_get_no_display (desktop_entry),
-                                            FALSE));
+-                                           FALSE,
+-                                           desktop_entry_get_no_display (desktop_entry)));
++                                           FALSE));
  }
  
-@@ -3275,7 +3296,6 @@ excluded_entries_listify_foreach (const char         *desktop_file_id,
+ static void
+@@ -3179,8 +3200,7 @@ excluded_entries_listify_foreach (const
+ 		     gmenu_tree_entry_new (directory,
  					   desktop_entry,
  					   desktop_file_id,
- 					   TRUE,
--                                           desktop_entry_get_no_display (desktop_entry),
-                                            FALSE));
+-					   TRUE,
+-                                           desktop_entry_get_no_display (desktop_entry)));
++					   TRUE));
  }
  
-@@ -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);
+ static void
+Index: gnome-menus-3.4.2/libmenu/gmenu-tree.h
+===================================================================
+--- gnome-menus-3.4.2.orig/libmenu/gmenu-tree.h	2012-06-23 20:28:56.000000000 +0200
++++ gnome-menus-3.4.2/libmenu/gmenu-tree.h	2012-06-23 20:29:01.950059558 +0200
+@@ -136,6 +136,7 @@ GMenuTreeDirectory *gmenu_tree_entry_get
  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
+ GMenuTreeDirectory *gmenu_tree_header_get_directory (GMenuTreeHeader *header);