wok-current annotate gtk+/stuff/revert-iconview.patch @ rev 11577

gtk+: Fix GtkIconView segfault (thank mojo)
author Antoine Bodin <gokhlayeh@slitaz.org>
date Mon Jan 02 23:06:19 2012 +0100 (2012-01-02)
parents
children
rev   line source
gokhlayeh@11577 1 From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001
gokhlayeh@11577 2 From: Cosimo Cecchi <cosimoc@gnome.org>
gokhlayeh@11577 3 Date: Wed, 16 Nov 2011 22:38:45 +0000
gokhlayeh@11577 4 Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel"
gokhlayeh@11577 5
gokhlayeh@11577 6 It makes GtkIconView segfault on GTK 2.24.
gokhlayeh@11577 7
gokhlayeh@11577 8 gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if
gokhlayeh@11577 9 there's a layout queued anyway, so we wouldn't end up in the same
gokhlayeh@11577 10 situation causing the crash the original patch is supposed to fix.
gokhlayeh@11577 11
gokhlayeh@11577 12 This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1.
gokhlayeh@11577 13
gokhlayeh@11577 14 https://bugzilla.gnome.org/show_bug.cgi?id=663138
gokhlayeh@11577 15 ---
gokhlayeh@11577 16 diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
gokhlayeh@11577 17 index 62877fa..54b3f3b 100644
gokhlayeh@11577 18 --- a/gtk/gtkiconview.c
gokhlayeh@11577 19 +++ b/gtk/gtkiconview.c
gokhlayeh@11577 20 @@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
gokhlayeh@11577 21
gokhlayeh@11577 22 gtk_icon_view_build_items (icon_view);
gokhlayeh@11577 23
gokhlayeh@11577 24 - gtk_icon_view_layout (icon_view);
gokhlayeh@11577 25 + gtk_icon_view_queue_layout (icon_view);
gokhlayeh@11577 26 }
gokhlayeh@11577 27
gokhlayeh@11577 28 g_object_notify (G_OBJECT (icon_view), "model");
gokhlayeh@11577 29 --
gokhlayeh@11577 30 cgit v0.9.0.2