Mercurial > pidgin
diff src/conversation.c @ 10364:db5e8c8b2abb
[gaim-migrate @ 11582]
aliases in tabs/titles, default : Yes
committer: Tailor Script <tailor@pidgin.im>
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Tue, 14 Dec 2004 04:18:31 +0000 |
parents | 655c48791b3c |
children | 5ea6c9dd10a2 |
line wrap: on
line diff
--- a/src/conversation.c Mon Dec 13 23:15:41 2004 +0000 +++ b/src/conversation.c Tue Dec 14 04:18:31 2004 +0000 @@ -1131,15 +1131,14 @@ 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 @@ /* 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_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