rpms/gnome-menus/F-12 fix-menu-sorting.patch, NONE, 1.1 gnome-menus.spec, 1.108, 1.109

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-menus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26254

Modified Files:
	gnome-menus.spec 
Added Files:
	fix-menu-sorting.patch 
Log Message:
Fix menu sorting


fix-menu-sorting.patch:
 gmenu-tree.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE fix-menu-sorting.patch ---
diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
index 84196b7..e03c146 100644
--- a/libmenu/gmenu-tree.c
+++ b/libmenu/gmenu-tree.c
@@ -1629,6 +1629,8 @@ gmenu_tree_item_compare_get_name_helper (GMenuTreeItem    *item,
 {
   const char *name;
 
+  name = NULL;
+
   switch (item->type)
     {
     case GMENU_TREE_ITEM_DIRECTORY:
@@ -1645,7 +1647,7 @@ gmenu_tree_item_compare_get_name_helper (GMenuTreeItem    *item,
 	  name = desktop_entry_get_name (GMENU_TREE_ENTRY (item)->desktop_entry);
 	  break;
 	case GMENU_TREE_SORT_DISPLAY_NAME:
-	  gmenu_tree_entry_get_display_name (GMENU_TREE_ENTRY (item));
+	  name = gmenu_tree_entry_get_display_name (GMENU_TREE_ENTRY (item));
 	  break;
 	default:
 	  g_assert_not_reached ();


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/F-12/gnome-menus.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- gnome-menus.spec	24 Sep 2009 23:18:29 -0000	1.108
+++ gnome-menus.spec	29 Sep 2009 15:08:51 -0000	1.109
@@ -6,7 +6,7 @@
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -21,6 +21,9 @@ BuildRequires: pkgconfig
 BuildRequires: python2-devel >= 2.3.0
 BuildRequires: intltool
 
+# upstream fix
+Patch0: fix-menu-sorting.patch
+
 %description
 gnome-menus is an implementation of the draft "Desktop
 Menu Specification" from freedesktop.org. This package
@@ -43,6 +46,7 @@ writing applications that use the GNOME 
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-menu-sorting
 
 %build
 %configure \
@@ -99,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnome-menus
 
 %changelog
+* Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-3
+- Fix menu sorting (#523636)
+
 * Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
 - Remove obsolete configure option