rpms/gtk2/F-12 toolbutton-assert.patch,1.1,1.2

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	toolbutton-assert.patch 
Log Message:
fix patch


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

Index: toolbutton-assert.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/toolbutton-assert.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- toolbutton-assert.patch	26 Oct 2009 05:03:58 -0000	1.1
+++ toolbutton-assert.patch	26 Oct 2009 05:14:37 -0000	1.2
@@ -1,21 +1,23 @@
 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
+--- gtk+-2.18.3/gtk/gtktoolbutton.c.toolbutton-assert	2009-10-16 10:38:56.000000000 -0400
++++ gtk+-2.18.3/gtk/gtktoolbutton.c	2009-10-26 01:12:26.146186990 -0400
+@@ -916,11 +916,15 @@ 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 (elided_label);
    g_free (old_label);
   
+   g_object_notify (G_OBJECT (button), "label");