don't attempt to add a NULL icon to the box.

Sat Jul 19 16:26:02 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbutton.c (gtk_tool_button_construct_contents): don't
	attempt to add a NULL icon to the box.

diff --git a/ChangeLog b/ChangeLog
index d87fd6cc0a618d3c27e3cfb8d7ca02ce55df46d5..66a3d69faa5a5b0ec848557b4aed4bae719fa7bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 19 16:26:02 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbutton.c (gtk_tool_button_construct_contents): don't
+       attempt to add a NULL icon to the box.
+
 Sat Jul 19 12:13:20 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtknotebook.c (gtk_notebook_focus_in|out): only redraw tabs

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d87fd6cc0a618d3c27e3cfb8d7ca02ce55df46d5..66a3d69faa5a5b0ec848557b4aed4bae719fa7bc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Jul 19 16:26:02 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbutton.c (gtk_tool_button_construct_contents): don't
+       attempt to add a NULL icon to the box.
+
 Sat Jul 19 12:13:20 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtknotebook.c (gtk_notebook_focus_in|out): only redraw tabs

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d87fd6cc0a618d3c27e3cfb8d7ca02ce55df46d5..66a3d69faa5a5b0ec848557b4aed4bae719fa7bc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Jul 19 16:26:02 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbutton.c (gtk_tool_button_construct_contents): don't
+       attempt to add a NULL icon to the box.
+
 Sat Jul 19 12:13:20 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtknotebook.c (gtk_notebook_focus_in|out): only redraw tabs

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d87fd6cc0a618d3c27e3cfb8d7ca02ce55df46d5..66a3d69faa5a5b0ec848557b4aed4bae719fa7bc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Jul 19 16:26:02 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbutton.c (gtk_tool_button_construct_contents): don't
+       attempt to add a NULL icon to the box.
+
 Sat Jul 19 12:13:20 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtknotebook.c (gtk_notebook_focus_in|out): only redraw tabs

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d87fd6cc0a618d3c27e3cfb8d7ca02ce55df46d5..66a3d69faa5a5b0ec848557b4aed4bae719fa7bc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Jul 19 16:26:02 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbutton.c (gtk_tool_button_construct_contents): don't
+       attempt to add a NULL icon to the box.
+
 Sat Jul 19 12:13:20 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtknotebook.c (gtk_notebook_focus_in|out): only redraw tabs

diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index cb46fbdb1cee6b630df7bb7a7b2d97c19921dfa4..75b4cb4883bc8e075d9d9c4151878df0a7eb4dba 100644 (file)
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -353,7 +353,8 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
 
     case GTK_TOOLBAR_BOTH:
       box = gtk_vbox_new (FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (box), icon, TRUE, TRUE, 0);
+      if (icon)
+       gtk_box_pack_start (GTK_BOX (box), icon, TRUE, TRUE, 0);
       gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE, 0);
       gtk_container_add (GTK_CONTAINER (button->priv->button), box);
       break;