rpms/gtk2/devel iconview-crash.patch, NONE, 1.1 gtk2.spec, 1.406, 1.407

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3035

Modified Files:
	gtk2.spec 
Added Files:
	iconview-crash.patch 
Log Message:
fix a crash in the appearance capplet


iconview-crash.patch:
 gtkiconview.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE iconview-crash.patch ---
diff -up gtk+-2.18.0/gtk/gtkiconview.c.iconview-crash gtk+-2.18.0/gtk/gtkiconview.c
--- gtk+-2.18.0/gtk/gtkiconview.c.iconview-crash	2009-09-28 12:38:46.956098207 -0400
+++ gtk+-2.18.0/gtk/gtkiconview.c	2009-09-28 12:40:03.636858596 -0400
@@ -3469,6 +3469,9 @@ gtk_icon_view_get_item_at_coords (GtkIco
   GList *items, *l;
   GdkRectangle box;
 
+  if (cell_at_pos)
+    *cell_at_pos = NULL;
+
   for (items = icon_view->priv->items; items; items = items->next)
     {
       GtkIconViewItem *item = items->data;
@@ -3503,9 +3506,6 @@ gtk_icon_view_get_item_at_coords (GtkIco
 		    }
 		}
 
-	      if (cell_at_pos)
-		*cell_at_pos = NULL;
-
 	      if (only_in_cell)
 		return NULL;
 	    }


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- gtk2.spec	27 Sep 2009 04:27:04 -0000	1.406
+++ gtk2.spec	28 Sep 2009 16:47:25 -0000	1.407
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -34,6 +34,8 @@ Patch1: gtk2-printing-smb-auth.patch
 Patch2: gtk2-printing-nonblocking-printer-list.patch
 # from upstream
 Patch3: fix-anchors.patch
+# from upstream
+Patch4: iconview-crash.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -148,6 +150,7 @@ This package contains developer document
 %patch1 -p1 -b .printing-smb-auth
 %patch2 -p1 -b .printing-nonblocking-printer-list
 %patch3 -p1 -b .fix-anchors
+%patch4 -p1 -b .iconview-crash
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -389,6 +392,9 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.0-3
+- Fix a crash in the appearance capplet
+
 * Sun Sep 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
 - Fix anchor handling in text views (#525910)