diff options
| author | Soeren Sandmann <sandmann@daimi.au.dk> | 2004-04-25 13:42:59 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-04-25 13:42:59 +0000 |
| commit | d20ae319fd84c4e2691a5e1310e106f33ab452dc (patch) | |
| tree | f2921f6f2bd14feac1314cd89297fc656859cc1c | |
| parent | 3054d1d8c3dc80c7909c64a5617b75630eaf86f4 (diff) | |
| download | gtk+-d20ae319fd84c4e2691a5e1310e106f33ab452dc.tar.gz | |
Fix cut'n'paste-o from previous commit. (#141046, Torsten Schoenfeld).
Sun Apr 25 15:36:02 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbutton.c (gtk_tool_button_set_label_widget): Fix
cut'n'paste-o from previous commit. (#141046, Torsten Schoenfeld).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gtk/gtktoolbutton.c | 6 |
6 files changed, 28 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sun Apr 25 15:36:02 2004 Soeren Sandmann <sandmann@daimi.au.dk> + + * 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 <thep@linux.thai.net> Patch to add support for string conversion callbacks to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b0b4a13fcf..171b9a5ea7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Apr 25 15:36:02 2004 Soeren Sandmann <sandmann@daimi.au.dk> + + * 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 <thep@linux.thai.net> Patch to add support for string conversion callbacks to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b0b4a13fcf..171b9a5ea7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Apr 25 15:36:02 2004 Soeren Sandmann <sandmann@daimi.au.dk> + + * 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 <thep@linux.thai.net> Patch to add support for string conversion callbacks to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b0b4a13fcf..171b9a5ea7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Apr 25 15:36:02 2004 Soeren Sandmann <sandmann@daimi.au.dk> + + * 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 <thep@linux.thai.net> Patch to add support for string conversion callbacks to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b0b4a13fcf..171b9a5ea7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Apr 25 15:36:02 2004 Soeren Sandmann <sandmann@daimi.au.dk> + + * 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 <thep@linux.thai.net> Patch to add support for string conversion callbacks to diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 8723f893c3..63da92a0b5 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); |