# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1007292620 0
# Node ID 66b1112d948fbc6d37383511995a491646548a60
# Parent  cdbe6e2f0ff2a7107845cbfb9be0c1097ea52fe2
[gaim-migrate @ 2847]
eh

committer: Tailor Script <tailor@pidgin.im>

diff -r cdbe6e2f0ff2 -r 66b1112d948f src/conversation.c
--- a/src/conversation.c	Sun Dec 02 10:08:09 2001 +0000
+++ b/src/conversation.c	Sun Dec 02 11:30:20 2001 +0000
@@ -2509,24 +2509,23 @@
 	int index;
 	GtkNotebook *nb;
 
-	if (!convo_notebook) {
-		char buf[256];
-		if ((find_log_info(c->name)) || (logging_options & OPT_LOG_ALL))
-			g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, c->name);
-		else
-			g_snprintf(buf, sizeof(buf), CONVERSATION_TITLE, c->name);
-		gtk_window_set_title(GTK_WINDOW(c->window), buf);
-		return;
-	}
-
 	if ((im_options & OPT_IM_ALIAS_TAB) && c->gc && ((b = find_buddy(c->gc, c->name)) != NULL))
 		text = b->show;
 	else
 		text = c->name;
 
-	nb = GTK_NOTEBOOK(convo_notebook);
-	index = g_list_index(conversations, c);
-	gtk_notebook_set_tab_label_text(nb, gtk_notebook_get_nth_page(nb, index), text);
+	if (!convo_notebook) {
+		char buf[256];
+		if ((find_log_info(c->name)) || (logging_options & OPT_LOG_ALL))
+			g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, text);
+		else
+			g_snprintf(buf, sizeof(buf), CONVERSATION_TITLE, text);
+		gtk_window_set_title(GTK_WINDOW(c->window), buf);
+	} else {
+		nb = GTK_NOTEBOOK(convo_notebook);
+		index = g_list_index(conversations, c);
+		gtk_notebook_set_tab_label_text(nb, gtk_notebook_get_nth_page(nb, index), text);
+	}
 }
 
 void set_convo_titles()
diff -r cdbe6e2f0ff2 -r 66b1112d948f src/prefs.c
--- a/src/prefs.c	Sun Dec 02 10:08:09 2001 +0000
+++ b/src/prefs.c	Sun Dec 02 11:30:20 2001 +0000
@@ -907,7 +907,7 @@
 			vbox2);
 	gaim_button(_("Raise windows on events"), &im_options, OPT_IM_POPUP, vbox2);
 	gaim_button(_("Show logins in window"), &im_options, OPT_IM_LOGON, vbox2);
-	gaim_button(_("Show aliases in tabs"), &im_options, OPT_IM_ALIAS_TAB, vbox2);
+	gaim_button(_("Show aliases in tabs/titles"), &im_options, OPT_IM_ALIAS_TAB, vbox2);
 	gaim_button(_("Hide window on send"), &im_options, OPT_IM_POPDOWN, vbox2);
 
 	frame = gtk_frame_new(_("Window Sizes"));