[Gaim-commits] CVS: gaim/src conversation.c,1.310,1.311 prefs.c,1.206,1.207

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv24050

Modified Files:
	conversation.c prefs.c 
Log Message:
eh


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -r1.310 -r1.311
--- conversation.c	2001/12/02 08:33:13	1.310
+++ conversation.c	2001/12/02 11:30:19	1.311
@@ -2509,24 +2509,23 @@
 	int index;
 	GtkNotebook *nb;
 
+	if ((im_options & OPT_IM_ALIAS_TAB) && c->gc && ((b = find_buddy(c->gc, c->name)) != NULL))
+		text = b->show;
+	else
+		text = c->name;
+
 	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);
+			g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, text);
 		else
-			g_snprintf(buf, sizeof(buf), CONVERSATION_TITLE, c->name);
+			g_snprintf(buf, sizeof(buf), CONVERSATION_TITLE, text);
 		gtk_window_set_title(GTK_WINDOW(c->window), buf);
-		return;
+	} 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);
 	}
-
-	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);
 }
 
 void set_convo_titles()

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -d -r1.206 -r1.207
--- prefs.c	2001/12/02 00:35:34	1.206
+++ prefs.c	2001/12/02 11:30:20	1.207
@@ -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"));