--- gnome-terminal-2.14.2/src/terminal-notebook.c	2006-07-23 21:05:57.000000000 +0200
+++ original/gnome-terminal-2.14.2/src/terminal-notebook.c	2006-01-30 05:15:18.000000000 +0100
@@ -737,8 +737,7 @@
   GtkRcStyle *rcstyle;
   GtkSettings *settings;
   gint w, h;
-  int close_button_on_tab = 0;
-  
+
   g_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   hbox = gtk_hbox_new (FALSE, 4);
@@ -756,40 +755,34 @@
   gtk_container_add (GTK_CONTAINER (label_ebox), label);
   gtk_box_pack_start (GTK_BOX (hbox), label_ebox, TRUE, TRUE, 0);
 
-  if (close_button_on_tab)
-  {
-  
-      close_button = gtk_button_new ();
-      gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
-      gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE);
-      gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
-      
-      rcstyle = gtk_rc_style_new ();
-      rcstyle->xthickness = rcstyle->ythickness = 0;
-      gtk_widget_modify_style (close_button, rcstyle);
-      gtk_rc_style_unref (rcstyle);
-
-      settings = gtk_widget_get_settings (GTK_WIDGET (label));
-      gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &w, &h);
-      gtk_widget_set_size_request (close_button, w + 2, h + 2);
-
-      image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
-      gtk_container_add (GTK_CONTAINER (close_button), image);
-      gtk_box_pack_start (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
-
-      gtk_tooltips_set_tip (nb->priv->tooltips, close_button, _("Close tab"), NULL);
-
-      g_signal_connect (G_OBJECT (close_button), "clicked",
-			G_CALLBACK (close_button_clicked_cb),
-			screen);
-  }
+  close_button = gtk_button_new ();
+  gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
+  gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE);
+  gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
+
+  rcstyle = gtk_rc_style_new ();
+  rcstyle->xthickness = rcstyle->ythickness = 0;
+  gtk_widget_modify_style (close_button, rcstyle);
+  gtk_rc_style_unref (rcstyle);
+
+  settings = gtk_widget_get_settings (GTK_WIDGET (label));
+  gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &w, &h);
+  gtk_widget_set_size_request (close_button, w + 2, h + 2);
+
+  image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (close_button), image);
+  gtk_box_pack_start (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
+
+  gtk_tooltips_set_tip (nb->priv->tooltips, close_button, _("Close tab"), NULL);
+
+  g_signal_connect (G_OBJECT (close_button), "clicked",
+		    G_CALLBACK (close_button_clicked_cb),
+		    screen);
 
-      
   gtk_widget_show (label);
   gtk_widget_show (label_ebox);
   gtk_widget_show (image);
-  if (close_button_on_tab)
-      gtk_widget_show (close_button);
+  gtk_widget_show (close_button);
   gtk_widget_show (hbox);
 
   update_tabs_visibility (nb, TRUE);
