rpms/gnome-menus/F-7 gnome-menus-2.19.4-dont-ref-null-tree.patch, NONE, 1.1 gnome-menus.spec, 1.57, 1.58

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-menus/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16068

Modified Files:
	gnome-menus.spec 
Added Files:
	gnome-menus-2.19.4-dont-ref-null-tree.patch 
Log Message:
- don't pass null to gmenu_tree_ref 
  (Patch by Rob Bradford <rob at robster.org.uk>, bug 253939)
- enable debugging unconditionally


gnome-menus-2.19.4-dont-ref-null-tree.patch:

--- NEW FILE gnome-menus-2.19.4-dont-ref-null-tree.patch ---
diff -up gnome-menus-2.19.4/libmenu/gmenu-tree.c.dont-ref-null-tree gnome-menus-2.19.4/libmenu/gmenu-tree.c
--- gnome-menus-2.19.4/libmenu/gmenu-tree.c.dont-ref-null-tree	2007-06-17 14:52:11.000000000 -0400
+++ gnome-menus-2.19.4/libmenu/gmenu-tree.c	2007-08-22 22:27:36.000000000 -0400
@@ -1022,7 +1022,10 @@ gmenu_tree_directory_get_tree (GMenuTree
 
   root = (GMenuTreeDirectoryRoot *) directory;
 
-  return gmenu_tree_ref (root->tree);
+  if (root->tree)
+    gmenu_tree_ref (root->tree);
+
+  return root->tree;
 }
 
 gboolean


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/F-7/gnome-menus.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnome-menus.spec	26 Jun 2007 20:24:49 -0000	1.57
+++ gnome-menus.spec	23 Aug 2007 02:37:36 -0000	1.58
@@ -1,12 +1,11 @@
 %define po_package gnome-menus
-%define enable_debugging 0
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.19.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -20,6 +19,9 @@
 BuildRequires: gettext
 BuildRequires: pkgconfig
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=430074
+Patch0: gnome-menus-2.19.4-dont-ref-null-tree.patch
+
 %description
 gnome-menus is an implementation of the draft "Desktop
 Menu Specification" from freedesktop.org. This package
@@ -42,14 +44,10 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .dont-ref-null-tree
 
 %build
-%configure \
-%if %{enable_debugging}
-   --enable-debug=yes
-%else
-   --enable-debug=no
-%endif
+%configure --enable-debug=yes
 
 make
 
@@ -98,6 +96,11 @@
 %{_includedir}/gnome-menus
 
 %changelog
+* Wed Aug 22 2007 Ray Strode <rstrode at redhat.com> - 2.19.4-2
+- don't pass null to gmenu_tree_ref 
+  (Patch by Rob Bradford <rob at robster.org.uk>, bug 253939)
+- enable debugging unconditionally
+
 * Tue Jun 16 2007 Colin Walters <walters at redhat.com> - 2.19.4-1
 - Update to 2.19.4