From d20ae319fd84c4e2691a5e1310e106f33ab452dc Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sun, 25 Apr 2004 13:42:59 +0000 Subject: [PATCH] Fix cut'n'paste-o from previous commit. (#141046, Torsten Schoenfeld). Sun Apr 25 15:36:02 2004 Soeren Sandmann * gtk/gtktoolbutton.c (gtk_tool_button_set_label_widget): Fix cut'n'paste-o from previous commit. (#141046, Torsten Schoenfeld). --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktoolbutton.c | 6 +++--- 6 files changed, 28 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0b4a13fc..171b9a5ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Apr 25 15:36:02 2004 Soeren Sandmann + + * gtk/gtktoolbutton.c (gtk_tool_button_set_label_widget): Fix + cut'n'paste-o from previous commit. (#141046, Torsten Schoenfeld). + 2004-04-24 Theppitak Karoonboonyanan Patch to add support for string conversion callbacks to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b0b4a13fc..171b9a5ea 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Apr 25 15:36:02 2004 Soeren Sandmann + + * gtk/gtktoolbutton.c (gtk_tool_button_set_label_widget): Fix + cut'n'paste-o from previous commit. (#141046, Torsten Schoenfeld). + 2004-04-24 Theppitak Karoonboonyanan Patch to add support for string conversion callbacks to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b0b4a13fc..171b9a5ea 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Apr 25 15:36:02 2004 Soeren Sandmann + + * gtk/gtktoolbutton.c (gtk_tool_button_set_label_widget): Fix + cut'n'paste-o from previous commit. (#141046, Torsten Schoenfeld). + 2004-04-24 Theppitak Karoonboonyanan Patch to add support for string conversion callbacks to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b0b4a13fc..171b9a5ea 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Apr 25 15:36:02 2004 Soeren Sandmann + + * gtk/gtktoolbutton.c (gtk_tool_button_set_label_widget): Fix + cut'n'paste-o from previous commit. (#141046, Torsten Schoenfeld). + 2004-04-24 Theppitak Karoonboonyanan Patch to add support for string conversion callbacks to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b0b4a13fc..171b9a5ea 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Apr 25 15:36:02 2004 Soeren Sandmann + + * gtk/gtktoolbutton.c (gtk_tool_button_set_label_widget): Fix + cut'n'paste-o from previous commit. (#141046, Torsten Schoenfeld). + 2004-04-24 Theppitak Karoonboonyanan Patch to add support for string conversion callbacks to diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 8723f893c..63da92a0b 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -890,10 +890,10 @@ gtk_tool_button_set_label_widget (GtkToolButton *button, { if (button->priv->label_widget) { - if (button->priv->icon_widget->parent) + if (button->priv->label_widget->parent) { - gtk_container_remove (GTK_CONTAINER (button->priv->icon_widget->parent), - button->priv->icon_widget); + gtk_container_remove (GTK_CONTAINER (button->priv->label_widget->parent), + button->priv->label_widget); } g_object_unref (button->priv->label_widget); -- 2.43.2