callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't leave priv->image dangling when use-stock is set to FALSE. (#437281,

Browse Source 
2007-07-03  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkbutton.c (gtk_button_construct_child): Don't leave
        priv->image dangling when use-stock is set to FALSE.  (#437281,
        Jochen Baier)


svn path=/trunk/; revision=18362
This commit is contained in:
Matthias Clasen
2007-07-03 17:09:42 +00:00
committed by Matthias Clasen
parent ccd3694e75
commit 34e44d63ea
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-07-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't leave
priv->image dangling when use-stock is set to FALSE. (#437281,
Jochen Baier)
2007-07-03 Tor Lillqvist <tml@novell.com> 2007-07-03 Tor Lillqvist <tml@novell.com>
* configure.in: Handle GDK_PIXBUF_EXTRA_LIBS like GDK_EXTRA_LIBS, * configure.in: Handle GDK_PIXBUF_EXTRA_LIBS like GDK_EXTRA_LIBS,

6
gtk/gtkbutton.c
View File

@ -733,14 +733,14 @@ gtk_button_construct_child (GtkButton *button)
image = g_object_ref (priv->image); image = g_object_ref (priv->image);
if (image->parent) if (image->parent)
gtk_container_remove (GTK_CONTAINER (image->parent), image); gtk_container_remove (GTK_CONTAINER (image->parent), image);
priv->image = NULL;
} }
priv->image = NULL;
if (GTK_BIN (button)->child) if (GTK_BIN (button)->child)
gtk_container_remove (GTK_CONTAINER (button), gtk_container_remove (GTK_CONTAINER (button),
GTK_BIN (button)->child); GTK_BIN (button)->child);
if (button->use_stock && if (button->use_stock &&
button->label_text && button->label_text &&
gtk_stock_lookup (button->label_text, &item)) gtk_stock_lookup (button->label_text, &item))