Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't trigger warnings if there are extra references to the hbox.

Browse Source 
2005-06-23  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkbutton.c (gtk_button_construct_child): Don't
	trigger warnings if there are extra references to the
	hbox.  (#308677, Dan Winship)
This commit is contained in:
Matthias Clasen
2005-06-23 04:25:37 +00:00
committed by Matthias Clasen
parent 4e4f41ef4f
commit 81560a213a
4 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2005-06-22 Matthias Clasen <mclasen@redhat.com> 2005-06-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't
trigger warnings if there are extra references to the
hbox. (#308677, Dan Winship)
* gtk/gtkfilesystemunix.c: Ignore everything after the * gtk/gtkfilesystemunix.c: Ignore everything after the
first space in lines from the .gtk-bookmarks file. first space in lines from the .gtk-bookmarks file.

4
ChangeLog.pre-2-10
View File

@@ -1,5 +1,9 @@
2005-06-22 Matthias Clasen <mclasen@redhat.com> 2005-06-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't
trigger warnings if there are extra references to the
hbox. (#308677, Dan Winship)
* gtk/gtkfilesystemunix.c: Ignore everything after the * gtk/gtkfilesystemunix.c: Ignore everything after the
first space in lines from the .gtk-bookmarks file. first space in lines from the .gtk-bookmarks file.

4
ChangeLog.pre-2-8
View File

@@ -1,5 +1,9 @@
2005-06-22 Matthias Clasen <mclasen@redhat.com> 2005-06-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't
trigger warnings if there are extra references to the
hbox. (#308677, Dan Winship)
* gtk/gtkfilesystemunix.c: Ignore everything after the * gtk/gtkfilesystemunix.c: Ignore everything after the
first space in lines from the .gtk-bookmarks file. first space in lines from the .gtk-bookmarks file.

6
gtk/gtkbutton.c
View File

@@ -644,7 +644,11 @@ gtk_button_construct_child (GtkButton *button)
if (GTK_BIN (button)->child) if (GTK_BIN (button)->child)
{ {
if (priv->image && !priv->image_is_stock) if (priv->image && !priv->image_is_stock)
image = g_object_ref (priv->image); {
image = g_object_ref (priv->image);
if (image->parent)
gtk_container_remove (GTK_CONTAINER (image->parent), image);
}
gtk_container_remove (GTK_CONTAINER (button), gtk_container_remove (GTK_CONTAINER (button),
GTK_BIN (button)->child); GTK_BIN (button)->child);