# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1325541979 -3600
# Node ID 885b23fb6687f73ebb6faac14ee3e2cbdb3f2c49
# Parent  87d98b449875cf0c0edc104026e988aacf906178
gtk+: Fix GtkIconView segfault (thank mojo)

diff -r 87d98b449875 -r 885b23fb6687 gtk+/receipt
--- a/gtk+/receipt	Mon Jan 02 23:06:19 2012 +0100
+++ b/gtk+/receipt	Mon Jan 02 23:06:19 2012 +0100
@@ -22,14 +22,17 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-    cd $src
-    ./configure \
-    	--prefix=/usr \
-    	--sysconfdir=/etc \
-    	--with-html-dir=/usr/share/doc \
+	cd $src
+
+	patch -Np1 -i "$stuff/revert-iconview.patch"
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--with-html-dir=/usr/share/doc \
 		--build=$HOST_SYSTEM --host=$HOST_SYSTEM &&
-    make $MAKEFLAGS &&
-    make DESTDIR=$DESTDIR install
+	make $MAKEFLAGS &&
+	make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 87d98b449875 -r 885b23fb6687 gtk+/stuff/revert-iconview.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk+/stuff/revert-iconview.patch	Mon Jan 02 23:06:19 2012 +0100
@@ -0,0 +1,30 @@
+From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Wed, 16 Nov 2011 22:38:45 +0000
+Subject: 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
+---
+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");
+--
+cgit v0.9.0.2