[gtk2/f16] upstream fix

[Matthias Clasen]

commit d9d779b03551e2d5341b3c72b7131bd05964d31f
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Nov 23 22:28:45 2011 -0500

    upstream fix

 ...view-layout-items-immediately-when-settin.patch |   35 ++++++++++++++++++++
 gtk2.spec                                          |    7 +++-
 2 files changed, 40 insertions(+), 2 deletions(-)
---
diff --git a/0001-Revert-iconview-layout-items-immediately-when-settin.patch b/0001-Revert-iconview-layout-items-immediately-when-settin.patch
new file mode 100644
index 0000000..069a946
--- /dev/null
+++ b/0001-Revert-iconview-layout-items-immediately-when-settin.patch
@@ -0,0 +1,35 @@
+From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc at gnome.org>
+Date: Wed, 16 Nov 2011 17:38:45 -0500
+Subject: [PATCH 1/4] Revert "iconview: layout items immediately when setting
+ a GtkTreeModel"
+
+It makes GtkIconView segfault on GTK 2.24.
+
+gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if
+there's a layout queued anyway, so we wouldn't end up in the same
+situation causing the crash the original patch is supposed to fix.
+
+This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663138
+---
+ gtk/gtkiconview.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
+index 62877fa..54b3f3b 100644
+--- a/gtk/gtkiconview.c
++++ b/gtk/gtkiconview.c
+@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
+ 
+       gtk_icon_view_build_items (icon_view);
+ 
+-      gtk_icon_view_layout (icon_view);
++      gtk_icon_view_queue_layout (icon_view);
+     }
+ 
+   g_object_notify (G_OBJECT (icon_view), "model");  
+-- 
+1.7.7.1
+
diff --git a/gtk2.spec b/gtk2.spec
index 2f3adb7..2c53311 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -18,7 +18,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: 2.24.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -39,6 +39,8 @@ Patch8: tooltip-positioning.patch
 #Patch14: gtk2-landscape-pdf-print.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=611313
 Patch15: window-dragging.patch
+# upstream fix
+Patch16: 0001-Revert-iconview-layout-items-immediately-when-settin.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -155,6 +157,7 @@ This package contains developer documentation for the GTK+ widget toolkit.
 %patch8 -p1 -b .tooltip-positioning
 #%patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .window-dragging
+%patch16 -p1
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@@ -341,7 +344,7 @@ fi
 %doc tmpdocs/examples
 
 %changelog
-* Wed Nov 23 2011 Matthias Clasen <mclasen at redhat.com> - 2.24.8-1
+* Wed Nov 23 2011 Matthias Clasen <mclasen at redhat.com> - 2.24.8-2
 - Update to 2.24.8
 
 * Wed Nov 02 2011 Bill Nottingham <notting at redhat.com> - 2.24.7-3