[Gaim-commits] CVS: gaim/src conversation.c,1.638,1.639 gtkprefs.c,1.239,1.240

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22528/src

Modified Files:
	conversation.c gtkprefs.c 
Log Message:
aliases in tabs/titles, default : Yes


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.638
retrieving revision 1.639
diff -u -d -p -r1.638 -r1.639
--- conversation.c	13 Dec 2004 00:52:05 -0000	1.638
+++ conversation.c	14 Dec 2004 04:18:31 -0000	1.639
@@ -1131,15 +1131,14 @@ gaim_conversation_autoset_title(GaimConv
 	account = gaim_conversation_get_account(conv);
 	name = gaim_conversation_get_name(conv);
 
-	if (gaim_prefs_get_bool("/core/conversations/use_alias_for_title")) {
-		if(gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
-			if(account && ((b = gaim_find_buddy(account, name)) != NULL))
-				text = gaim_buddy_get_local_alias(b);
-		} else if(gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
-			if(account && ((chat = gaim_blist_find_chat(account, name)) != NULL))
-				text = chat->alias;
-		}
+	if(gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
+		if(account && ((b = gaim_find_buddy(account, name)) != NULL))
+			text = gaim_buddy_get_local_alias(b);
+	} else if(gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
+		if(account && ((chat = gaim_blist_find_chat(account, name)) != NULL))
+			text = chat->alias;
 	}
+	
 
 	if(text == NULL)
 		text = name;
@@ -2768,7 +2767,6 @@ gaim_conversations_init(void)
 
 	/* Conversations */
 	gaim_prefs_add_none("/core/conversations");
-	gaim_prefs_add_bool("/core/conversations/use_alias_for_title", TRUE);
 
 	/* Conversations -> Chat */
 	gaim_prefs_add_none("/core/conversations/chat");
@@ -2778,9 +2776,6 @@ gaim_conversations_init(void)
 	gaim_prefs_add_none("/core/conversations/im");
 	gaim_prefs_add_bool("/core/conversations/im/send_typing", TRUE);
 
-	/* Connect callbacks for changed preferences */
-	gaim_prefs_connect_callback(handle, "/core/conversations/use_alias_for_title",
-			update_titles_pref_cb, NULL);
 
 	/**********************************************************************
 	 * Register signals

Index: gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -p -r1.239 -r1.240
--- gtkprefs.c	13 Dec 2004 23:15:41 -0000	1.239
+++ gtkprefs.c	14 Dec 2004 04:18:31 -0000	1.240
@@ -891,8 +891,6 @@ GtkWidget *conv_page() {
 
 	gaim_gtk_prefs_checkbox(_("Show _formatting toolbar"),
 				  "/gaim/gtk/conversations/show_formatting_toolbar", vbox);
-	gaim_gtk_prefs_checkbox(_("Show _aliases in tabs/titles"),
-			"/core/conversations/use_alias_for_title", vbox);
 	gaim_gtk_prefs_checkbox(_("Show buddy _icons"),
 			"/gaim/gtk/conversations/im/show_buddy_icons", vbox);
 	gaim_gtk_prefs_checkbox(_("Enable buddy ic_on animation"),
@@ -2358,6 +2356,7 @@ void gaim_gtk_prefs_update_old() {
 	gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete");
 	gaim_prefs_remove("/gaim/gtk/conversations/im/raise_on_events");
 	gaim_prefs_remove("/gaim/gtk/conversations/chat/raise_on_events");
+	gaim_prefs_remove("/core/conversations/use_alias_for_title");
 	gaim_prefs_remove("/gaim/gtk/sound/signon");
 	gaim_prefs_remove("/gaim/gtk/sound/silent_signon");
 	gaim_prefs_remove("/gaim/gtk/logging/individual_logs");