[gentoo-commits] gentoo-x86 commit in x11-libs/gtk+/files: gtk+-2.24.8-iconview-layout.patch

[Alexandre Rostovtsev (tetromino)]

tetromino    11/11/17 03:15:34

  Added:                gtk+-2.24.8-iconview-layout.patch
  Log:
  Add upstream patch to prevent segfault in gtk_icon_view_layout_single_row, drop broken version. Thanks to Rafał Mużyło (galtgendo) for reporting.
  
  (Portage version: 2.2.0_alpha74/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-libs/gtk+/files/gtk+-2.24.8-iconview-layout.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.24.8-iconview-layout.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.24.8-iconview-layout.patch?rev=1.1&content-type=text/plain

Index: gtk+-2.24.8-iconview-layout.patch
===================================================================
From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@×××××.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