# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1084687436 0
# Node ID 80944edf8d8001e29bf748ae4d0a39c5946a8713
# Parent  6d7b403b11bb1fd2f3fb9d52461faebdb366658c
[gaim-migrate @ 9718]
Eradicate the "Icons on tabs" preference, defaulting to yes.

committer: Tailor Script <tailor@pidgin.im>

diff -r 6d7b403b11bb -r 80944edf8d80 src/gtkconv.c
--- a/src/gtkconv.c	Sun May 16 05:52:00 2004 +0000
+++ b/src/gtkconv.c	Sun May 16 06:03:56 2004 +0000
@@ -4261,11 +4261,8 @@
 	gtk_box_pack_start(GTK_BOX(menu_tabby), gtkconv->menu_icon,
 					   FALSE, FALSE, 0);
 
-	if (gaim_prefs_get_bool("/gaim/gtk/conversations/icons_on_tabs"))
-	{
-		gtk_widget_show_all(gtkconv->icon);
-		gtk_widget_show_all(gtkconv->menu_icon);
-	}
+	gtk_widget_show_all(gtkconv->icon);
+	gtk_widget_show_all(gtkconv->menu_icon);
 
 	gtk_box_pack_start(GTK_BOX(tabby), gtkconv->tab_label, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(menu_tabby), gtkconv->menu_label, TRUE, TRUE, 0);
@@ -5109,13 +5106,11 @@
 	{
 		gray_stuff_out(gaim_conv_window_get_active_conversation(win));
 		generate_send_as_items(win, NULL);
-		if (gaim_prefs_get_bool("/gaim/gtk/conversations/icons_on_tabs"))
-			update_tab_icon(conv);
+		update_tab_icon(conv);
 	}
 	else if (type == GAIM_CONV_UPDATE_AWAY)
 	{
-		if (gaim_prefs_get_bool("/gaim/gtk/conversations/icons_on_tabs"))
-			update_tab_icon(conv);
+		update_tab_icon(conv);
 	}
 	else if (type == GAIM_CONV_UPDATE_ADD || type == GAIM_CONV_UPDATE_REMOVE ||
 	         type == GAIM_CONV_UPDATE_CHATLEFT)
@@ -5536,34 +5531,6 @@
 }
 
 static void
-icons_on_tabs_pref_cb(const char *name, GaimPrefType type, gpointer value,
-					  gpointer data)
-{
-	GList *l;
-	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
-
-	for (l = gaim_get_conversations(); l != NULL; l = l->next) {
-		conv = (GaimConversation *)l->data;
-
-		if (!GAIM_IS_GTK_CONVERSATION(conv))
-			continue;
-
-		gtkconv = GAIM_GTK_CONVERSATION(conv);
-
-		if (value) {
-			update_tab_icon(conv);
-			gtk_widget_show(gtkconv->icon);
-			gtk_widget_show(gtkconv->menu_icon);
-		}
-		else {
-			gtk_widget_hide(gtkconv->icon);
-			gtk_widget_hide(gtkconv->menu_icon);
-		}
-	}
-}
-
-static void
 close_on_tabs_pref_cb(const char *name, GaimPrefType type, gpointer value,
 						gpointer data)
 {
@@ -5839,7 +5806,6 @@
 
 	/* Conversations */
 	gaim_prefs_add_none("/gaim/gtk/conversations");
-	gaim_prefs_add_bool("/gaim/gtk/conversations/icons_on_tabs", TRUE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/close_on_tabs", TRUE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/ctrl_enter_sends", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/enter_sends", TRUE);
@@ -5889,8 +5855,6 @@
 	/* Connect callbacks. */
 	gaim_prefs_connect_callback("/gaim/gtk/conversations/escape_closes",
 								escape_closes_pref_cb, NULL);
-	gaim_prefs_connect_callback("/gaim/gtk/conversations/icons_on_tabs",
-								icons_on_tabs_pref_cb, NULL);
 	gaim_prefs_connect_callback("/gaim/gtk/conversations/close_on_tabs",
 								close_on_tabs_pref_cb, NULL);
 	gaim_prefs_connect_callback("/gaim/gtk/conversations/show_timestamps",
diff -r 6d7b403b11bb -r 80944edf8d80 src/gtkprefs.c
--- a/src/gtkprefs.c	Sun May 16 05:52:00 2004 +0000
+++ b/src/gtkprefs.c	Sun May 16 06:03:56 2004 +0000
@@ -951,18 +951,6 @@
 
 	g_signal_connect(G_OBJECT(tabs_checkbox), "clicked",
 					 G_CALLBACK(gaim_gtk_toggle_sensitive), close_checkbox);
-#if 0 /* PREFSLASH04 */
-	icons_checkbox = gaim_gtk_prefs_checkbox(_("Show status _icons on tabs"),
-									"/gaim/gtk/conversations/icons_on_tabs",
-									vbox);
-
-	if (!gaim_prefs_get_bool("/gaim/gtk/conversations/tabs")) {
-		gtk_widget_set_sensitive(GTK_WIDGET(icons_checkbox), FALSE);
-		}
-
-	g_signal_connect(G_OBJECT(tabs_checkbox), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive), icons_checkbox);
-#endif /* PREFSLASH04 */
 
 	gtk_widget_show_all(ret);
 
@@ -2936,6 +2924,7 @@
 
 	/* Remove some no-longer-used prefs */
 	gaim_prefs_remove("/gaim/gtk/blist/show_group_count");
+	gaim_prefs_remove("/gaim/gtk/conversations/icons_on_tabs");
 	gaim_prefs_remove("/gaim/gtk/conversations/ignore_colors");
 	gaim_prefs_remove("/gaim/gtk/conversations/ignore_fonts");
 	gaim_prefs_remove("/gaim/gtk/conversations/ignore_font_sizes");