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).

diff --git a/ChangeLog b/ChangeLog
index b0b4a13fcfc3f3e8550a234a227e42d0c211606d..171b9a5ea71d7887c48eda6a67177754574315ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 b0b4a13fcfc3f3e8550a234a227e42d0c211606d..171b9a5ea71d7887c48eda6a67177754574315ce 100644 (file)
--- 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 b0b4a13fcfc3f3e8550a234a227e42d0c211606d..171b9a5ea71d7887c48eda6a67177754574315ce 100644 (file)
--- 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 b0b4a13fcfc3f3e8550a234a227e42d0c211606d..171b9a5ea71d7887c48eda6a67177754574315ce 100644 (file)
--- 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 b0b4a13fcfc3f3e8550a234a227e42d0c211606d..171b9a5ea71d7887c48eda6a67177754574315ce 100644 (file)
--- 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 8723f893c3455761be0c4b25f4e6023950b9735e..63da92a0b55915b07f79acaeb91bb53f3d357801 100644 (file)
--- 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);