rpms/gtk2/F-12 iconview-hang.patch,NONE,1.1 gtk2.spec,1.422,1.423

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23544

Modified Files:
	gtk2.spec 
Added Files:
	iconview-hang.patch 
Log Message:

* Fri Oct 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.18.3-11
- Fix a GtkIconView hang


iconview-hang.patch:
 gtkiconview.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE iconview-hang.patch ---
diff -up gtk+-2.18.3/gtk/gtkiconview.c.icon-view-hang gtk+-2.18.3/gtk/gtkiconview.c
--- gtk+-2.18.3/gtk/gtkiconview.c.icon-view-hang	2009-10-09 01:00:44.000000000 -0400
+++ gtk+-2.18.3/gtk/gtkiconview.c	2009-10-23 20:09:18.670311545 -0400
@@ -1545,6 +1545,11 @@ gtk_icon_view_expose (GtkWidget *widget,
   if (expose->window != icon_view->priv->bin_window)
     return FALSE;
 
+  /* If a layout has been scheduled, do it now so that all
+   * cell view items have valid sizes before we proceed. */
+  if (icon_view->priv->layout_idle_id != 0)
+    gtk_icon_view_layout (icon_view);
+
   cr = gdk_cairo_create (icon_view->priv->bin_window);
   cairo_set_line_width (cr, 1.);
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -p -r1.422 -r1.423
--- gtk2.spec	23 Oct 2009 21:25:42 -0000	1.422
+++ gtk2.spec	24 Oct 2009 00:15:50 -0000	1.423
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -38,6 +38,8 @@ Patch5: zerosize.patch
 Patch6: compose-sequences.patch
 Patch7: symbolic-color-parsing.patch
 Patch8: tooltip-positioning.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=581150
+Patch9: iconview-hang.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -157,6 +159,7 @@ This package contains developer document
 %patch6 -p1 -b .compose-sequences
 %patch7 -p1 -b .symbolic-color-parsing
 %patch8 -p1 -b .tooltip-positioning
+%patch9 -p1 -b .iconview-hang
 
 %build
 libtoolize --force --copy
@@ -393,6 +396,9 @@ fi
 
 
 %changelog
+* Fri Oct 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.18.3-11
+- Fix a GtkIconView hang
+
 * Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-10
 - Tweak tooltip positioning
 - Make new tooltip style an opt-in theme choice