# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1205738327 0
# Node ID d38f7962c052a76d421814f8399cb78b872adb38
# Parent  79e38938597d0162e8aa3da82c7b2a52014018b9
(free_frame_tool_bar): Only call gtk_container_remove if
handlebox_widget is != 0.

diff -r 79e38938597d -r d38f7962c052 src/gtkutil.c
--- a/src/gtkutil.c	Mon Mar 17 02:38:26 2008 +0000
+++ b/src/gtkutil.c	Mon Mar 17 07:18:47 2008 +0000
@@ -4139,9 +4139,16 @@
 
   if (x->toolbar_widget)
     {
+      int is_packed = x->handlebox_widget != 0;
       BLOCK_INPUT;
-      gtk_container_remove (GTK_CONTAINER (x->vbox_widget),
-                            x->handlebox_widget);
+      /* We may have created the toolbar_widget in xg_create_tool_bar, but
+         not the x->handlebox_widget which is created in xg_pack_tool_bar.  */
+      if (is_packed)
+        gtk_container_remove (GTK_CONTAINER (x->vbox_widget),
+                              x->handlebox_widget);
+      else
+        gtk_widget_destroy (x->toolbar_widget);
+
       x->toolbar_widget = 0;
       x->handlebox_widget = 0;
       FRAME_TOOLBAR_HEIGHT (f) = 0;