diff -Naurp gedit.orig/gedit/gedit-notebook.c gedit/gedit/gedit-notebook.c
--- gedit.orig/gedit/gedit-notebook.c	2008-11-19 00:09:22.000000000 +0100
+++ gedit/gedit/gedit-notebook.c	2008-11-19 00:19:39.000000000 +0100
@@ -69,7 +69,6 @@ struct _GeditNotebookPrivate
 	gint           x_start;
 	gint           y_start;
 	gint           drag_in_progress : 1;
-	gint	       always_show_tabs : 1;
 	gint           close_buttons_sensitive : 1;
 	gint           tab_drag_and_drop_enabled : 1;
 };
@@ -646,7 +645,7 @@ update_tabs_visibility (GeditNotebook *n
 
 	if (before_inserting) num++;
 
-	show_tabs = (nb->priv->always_show_tabs || num > 1);
+	show_tabs = num > 1;
 
 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nb), show_tabs);
 }
@@ -663,8 +662,6 @@ gedit_notebook_init (GeditNotebook *note
 	gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
 
-	notebook->priv->always_show_tabs = TRUE;
-
 	g_signal_connect (notebook, 
 			  "button-press-event",
 			  (GCallback)button_press_cb, 
@@ -880,17 +877,6 @@ build_tab_label (GeditNotebook *nb, 
 }
 
 void
-gedit_notebook_set_always_show_tabs (GeditNotebook *nb, 
-				     gboolean       show_tabs)
-{
-	g_return_if_fail (GEDIT_IS_NOTEBOOK (nb));
-
-	nb->priv->always_show_tabs = (show_tabs != FALSE);
-
-	update_tabs_visibility (nb, FALSE);
-}
-
-void
 gedit_notebook_add_tab (GeditNotebook *nb,
 		        GeditTab      *tab,
 		        gint           position,
diff -Naurp gedit.orig/gedit/gedit-notebook.h gedit/gedit/gedit-notebook.h
--- gedit.orig/gedit/gedit-notebook.h	2008-11-19 00:09:22.000000000 +0100
+++ gedit/gedit/gedit-notebook.h	2008-11-19 00:19:39.000000000 +0100
@@ -119,11 +119,6 @@ void            gedit_notebook_move_tab	
 						 GeditTab      *tab,
 						 gint           dest_position);
 
-/* FIXME: do we really need this function ? */
-void		gedit_notebook_set_always_show_tabs	
-						(GeditNotebook *nb,
-						 gboolean       show_tabs);
-
 void		gedit_notebook_set_close_buttons_sensitive
 						(GeditNotebook *nb,
 						 gboolean       sensitive);
