- break infinite loop

This commit is contained in:
Ray Strode 2006-02-06 17:22:38 +00:00
parent ff33c36654
commit 3dd6a428aa
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,21 @@
--- gnome-menus-2.13.5/libmenu/gmenu-tree.c.break-loop 2006-02-06 12:16:09.000000000 -0500
+++ gnome-menus-2.13.5/libmenu/gmenu-tree.c 2006-02-06 12:16:25.000000000 -0500
@@ -764,8 +764,7 @@
path = NULL;
}
- tmp = directory->contents;
- while (tmp != NULL)
+ for (tmp = directory->contents; tmp != NULL; tmp = tmp->next)
{
GMenuTreeItem *item = tmp->data;
@@ -781,8 +780,6 @@
else
return GMENU_TREE_DIRECTORY (item);
}
-
- tmp = tmp->next;
}
g_free (freeme);

View File

@ -7,7 +7,7 @@
Summary: A menu system for the GNOME project
Name: gnome-menus
Version: 2.13.5
Release: 4
Release: 5
License: LGPL
Group: System Environment/Libraries
URL: http://www.gnome.org/
@ -18,6 +18,7 @@ Requires: python-abi = %{pyver}
BuildRequires: glib2-devel >= 2.6.0
BuildRequires: %{python}-devel >= 2.3.0
BuildRequires: gamin-devel
Patch0: gnome-menus-2.13.5-break-loop.patch
%description
gnome-menus is an implementation of the draft "Desktop
@ -37,6 +38,7 @@ writing applications that use the GNOME menu system.
%prep
%setup -q
%patch0 -p1 -b .break-loop
%build
%configure \
@ -89,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/gnome-menu-spec-test
%changelog
* Mon Feb 6 2006 Ray Strode <rstrode@redhat.com> 2.13.5-5
- break infinite loop
* Wed Feb 1 2006 Ray Strode <rstrode@redhat.com> 2.13.5-4
- don't ship upstream Desktop.directory files