29a30
> #include <gconf/gconf-client.h>
777a779,780
>   GConfClient *conf = gconf_client_get_default ();
> 
798,818c801,828
<   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);
< 
<   if (G_LIKELY (nb->priv->rcstyle))
<     {
<       gtk_widget_modify_style (close_button, nb->priv->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);
< 
<   if (G_LIKELY (nb->priv->tooltips))
<     {
<       gtk_tooltips_set_tip (nb->priv->tooltips, close_button, _("Close tab"), NULL);
---
>   if (gconf_client_get_bool (conf, CONF_GLOBAL_PREFIX "/close_button_on_tabs", 0))
> 	 {
> 		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);
> 
> 		if (G_LIKELY (nb->priv->rcstyle))
> 		  {
> 			gtk_widget_modify_style (close_button, nb->priv->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);
> 
> 	   if (G_LIKELY (nb->priv->tooltips))
> 		  {
> 			 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);
820,824d829
< 
<   g_signal_connect (G_OBJECT (close_button), "clicked",
< 		    G_CALLBACK (close_button_clicked_cb),
< 		    screen);
< 
827,828c832,836
<   gtk_widget_show (image);
<   gtk_widget_show (close_button);
---
>   if (gconf_client_get_bool (conf, CONF_GLOBAL_PREFIX "/close_button_on_tabs", NULL))
>     {
> 		gtk_widget_show (image);
> 		gtk_widget_show (close_button);
> 	 }
1788a1789,1802
>       <key>/schemas/apps/gnome-terminal/global/close_button_on_tabs</key>
>       <applyto>/apps/gnome-terminal/global/close_button_on_tabs</applyto>
>       <owner>gnome-terminal</owner>
>       <type>bool</type>
>       <default>true</default>
>       <locale name="C">
>          <short>Show close button on tabs</short>
>          <long>
> 			Show close button on tabs
>          </long>
>       </locale>
>     </schema>
> 
>     <schema>
