wok diff gtk+/stuff/revert-iconview.patch @ rev 11662

Up firefox (10.0.1, security fix)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Feb 13 09:56:04 2012 +0100 (2012-02-13)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gtk+/stuff/revert-iconview.patch	Mon Feb 13 09:56:04 2012 +0100
     1.3 @@ -0,0 +1,30 @@
     1.4 +From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001
     1.5 +From: Cosimo Cecchi <cosimoc@gnome.org>
     1.6 +Date: Wed, 16 Nov 2011 22:38:45 +0000
     1.7 +Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel"
     1.8 +
     1.9 +It makes GtkIconView segfault on GTK 2.24.
    1.10 +
    1.11 +gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if
    1.12 +there's a layout queued anyway, so we wouldn't end up in the same
    1.13 +situation causing the crash the original patch is supposed to fix.
    1.14 +
    1.15 +This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1.
    1.16 +
    1.17 +https://bugzilla.gnome.org/show_bug.cgi?id=663138
    1.18 +---
    1.19 +diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
    1.20 +index 62877fa..54b3f3b 100644
    1.21 +--- a/gtk/gtkiconview.c
    1.22 ++++ b/gtk/gtkiconview.c
    1.23 +@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
    1.24 +
    1.25 +       gtk_icon_view_build_items (icon_view);
    1.26 +
    1.27 +-      gtk_icon_view_layout (icon_view);
    1.28 ++      gtk_icon_view_queue_layout (icon_view);
    1.29 +     }
    1.30 +
    1.31 +   g_object_notify (G_OBJECT (icon_view), "model");
    1.32 +--
    1.33 +cgit v0.9.0.2