# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1187816120 0
# Node ID cbc08c427db6653d05579eaadd5b54075709b5e6
# Parent  272d08484f7d846fe68a0c4bdd5b0088c22c307b
Don't show tabs if tabs aren't turned on. Fixes #2669

diff -r 272d08484f7d -r cbc08c427db6 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Wed Aug 22 20:44:42 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Aug 22 20:55:20 2007 +0000
@@ -8771,14 +8771,15 @@
 	}
 
 	gtk_notebook_set_tab_label_packing(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, 
-					   !tabs_side && !angle && pidgin_conv_window_get_gtkconv_count(win) > 1, 
+					   !tabs_side && !angle, 
 					   TRUE, GTK_PACK_START);
 
 	if (pidgin_conv_window_get_gtkconv_count(win) == 1) 
 		gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
-                                           !purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons") ||  
+					   purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs") &&
+                                           (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons") ||  
                                            purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_LEFT ||
-                                           purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_RIGHT);
+                                           purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_RIGHT));
 
 	/* show the widgets */
 /*	gtk_widget_show(gtkconv->icon); */