[gtk+/gtk-2-24-quartz] Revert "iconview: layout items immediately when setting a GtkTreeModel"
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24-quartz] Revert "iconview: layout items immediately when setting a GtkTreeModel"
- Date: Wed, 23 Nov 2011 23:05:06 +0000 (UTC)
commit 8c932e9a8108d9f879b2667a9143d7de68247b7b
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Nov 16 17:38:45 2011 -0500
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");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]