r16819 - in /desktop/unstable/gnome-menus/debian: changelog patches/12_merge_duplicates.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Aug 29 10:19:58 2008
New Revision: 16819

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16819
Log:
12_merge_duplicates.patch: also merge entries which appear more than 
twice. Closes: #494667.

Modified:
    desktop/unstable/gnome-menus/debian/changelog
    desktop/unstable/gnome-menus/debian/patches/12_merge_duplicates.patch

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=16819&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog (original)
+++ desktop/unstable/gnome-menus/debian/changelog Fri Aug 29 10:19:58 2008
@@ -1,3 +1,10 @@
+gnome-menus (2.22.2-4) unstable; urgency=low
+
+  * 12_merge_duplicates.patch: also merge entries which appear more than 
+    twice. Closes: #494667.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 29 Aug 2008 11:21:11 +0200
+
 gnome-menus (2.22.2-3) unstable; urgency=low
 
   * Rename Science.directory to GnomeScience.directory. Closes: #491184.

Modified: desktop/unstable/gnome-menus/debian/patches/12_merge_duplicates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/12_merge_duplicates.patch?rev=16819&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/12_merge_duplicates.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/12_merge_duplicates.patch Fri Aug 29 10:19:58 2008
@@ -1,11 +1,11 @@
 Debian #447823 and #444587
 GNOME #490483
 
-Index: gnome-menus-2.22.1/libmenu/gmenu-tree.c
+Index: gnome-menus-2.22.2/libmenu/gmenu-tree.c
 ===================================================================
---- gnome-menus-2.22.1.orig/libmenu/gmenu-tree.c	2008-05-13 13:00:03.028979620 +0200
-+++ gnome-menus-2.22.1/libmenu/gmenu-tree.c	2008-05-13 13:06:26.088988539 +0200
-@@ -3433,6 +3433,72 @@ process_only_unallocated (GMenuTree     
+--- gnome-menus-2.22.2.orig/libmenu/gmenu-tree.c	2008-08-29 11:18:36.063994586 +0200
++++ gnome-menus-2.22.2/libmenu/gmenu-tree.c	2008-08-29 11:21:00.868667108 +0200
+@@ -3440,6 +3440,73 @@ process_only_unallocated (GMenuTree     
  static void process_layout_info (GMenuTree          *tree,
  				 GMenuTreeDirectory *directory);
  
@@ -69,6 +69,7 @@
 +            {
 +              directory->contents = g_slist_delete_link (directory->contents, next);
 +              gmenu_tree_item_unref_and_unset_parent (b);
++              continue;
 +            }
 +        }
 +      l = l->next;
@@ -76,9 +77,9 @@
 +}
 +
  static void
- merge_subdir (GMenuTree          *tree,
- 	      GMenuTreeDirectory *directory,
-@@ -3639,6 +3705,8 @@ merge_subdirs (GMenuTree          *tree,
+ check_pending_separator (GMenuTreeDirectory *directory)
+ {
+@@ -3663,6 +3730,8 @@ merge_subdirs (GMenuTree          *tree,
  
    g_slist_free (subdirs);
    g_slist_free (except);
@@ -87,7 +88,7 @@
  }
  
  static void
-@@ -3743,6 +3811,8 @@ merge_subdirs_and_entries (GMenuTree    
+@@ -3767,6 +3836,8 @@ merge_subdirs_and_entries (GMenuTree    
    g_slist_free (items);
    g_slist_free (except_subdirs);
    g_slist_free (except_entries);