From 55398b01baaf6e30ec34a31db205ce0b8b354792 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Mar 30 2007 21:13:00 +0000
Subject: - make gweather applet preferences find feature work slightly better (bug

    209488)

---

diff --git a/gnome-applets-2.18.0-fix-find.patch b/gnome-applets-2.18.0-fix-find.patch
new file mode 100644
index 0000000..0be4ed5
--- /dev/null
+++ b/gnome-applets-2.18.0-fix-find.patch
@@ -0,0 +1,15 @@
+--- gnome-applets-2.18.0/gweather/gweather-pref.c.fix-find	2007-03-30 14:41:33.000000000 -0400
++++ gnome-applets-2.18.0/gweather/gweather-pref.c	2007-03-30 16:59:27.000000000 -0400
+@@ -618,8 +618,10 @@
+ 
+ 	if (go_parent) {
+ 		iter_parent = *iter;
+-		if (gtk_tree_model_iter_parent (model, iter, &iter_parent) && gtk_tree_model_iter_next (model, iter)) {
+-			return find_location (model, iter, location, TRUE);
++                while (gtk_tree_model_iter_parent (model, iter, &iter_parent)) {
++			if (gtk_tree_model_iter_next (model, iter))
++				return find_location (model, iter, location, TRUE);
++			iter_parent = *iter;
+ 		}
+ 	}
+ 
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e16ee90..382992c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.18.0
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -52,6 +52,9 @@ Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=395035
 Patch30:	gnome-applets-2.16.0.1-fix-null-applet.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=424639
+Patch31:        gnome-applets-2.18.0-fix-find.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -318,6 +321,10 @@ fi
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Fri Mar 30 2007 Ray Strode <rstrode@redhat.com> - 1:2.18.0-4
+- make gweather applet preferences find feature work slightly
+  better (bug 209488)
+
 * Wed Mar 28 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.18.0-3
 - Remove non-XKB support files to save space