rpms/gtk2/F-12 toolbutton-assert.patch, NONE, 1.1 gtk2.spec, 1.424, 1.425

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18427

Modified Files:
	gtk2.spec 
Added Files:
	toolbutton-assert.patch 
Log Message:
Fix a possible assertion failure in GtkToolButton


toolbutton-assert.patch:
 gtktoolbutton.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE toolbutton-assert.patch ---
diff -up gtk+-2.18.3/gtk/gtktoolbutton.c.toolbutton-assert gtk+-2.18.3/gtk/gtktoolbutton.c
--- gtk+-2.18.3/gtk/gtktoolbutton.c.toolbutton-assert	2009-10-26 01:00:01.837187173 -0400
+++ gtk+-2.18.3/gtk/gtktoolbutton.c	2009-10-26 00:59:21.061192110 -0400
@@ -916,10 +916,13 @@ gtk_tool_button_set_label (GtkToolButton
   button->priv->label_text = g_strdup (label);
   button->priv->contents_invalid = TRUE;     
 
-  elided_label = _gtk_toolbar_elide_underscores (label);
-  accessible = gtk_widget_get_accessible (GTK_WIDGET (button->priv->button));
-  atk_object_set_name (accessible, elided_label);
-  g_free (elided_label);
+  if (label)
+    {
+      elided_label = _gtk_toolbar_elide_underscores (label);
+      accessible = gtk_widget_get_accessible (GTK_WIDGET (button->priv->button));
+      atk_object_set_name (accessible, elided_label);
+      g_free (elided_label);
+    }
 
   g_free (old_label);
  


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -p -r1.424 -r1.425
--- gtk2.spec	26 Oct 2009 03:54:32 -0000	1.424
+++ gtk2.spec	26 Oct 2009 05:03:58 -0000	1.425
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -43,6 +43,8 @@ Patch7: symbolic-color-parsing.patch
 Patch8: tooltip-positioning.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=581150
 Patch9: iconview-hang.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599446
+Patch10: toolbutton-assert.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -163,6 +165,7 @@ This package contains developer document
 %patch7 -p1 -b .symbolic-color-parsing
 %patch8 -p1 -b .tooltip-positioning
 %patch9 -p1 -b .iconview-hang
+%patch10 -p1 -b .toolbutton-assert
 
 %build
 libtoolize --force --copy
@@ -399,6 +402,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Matthias Clasen <mclasen at redhta.com> - 2.18.3-12
+- Fix a possible assertion failure in GtkToolButton
+
 * Fri Oct 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.18.3-11
 - Fix a GtkIconView hang