Mercurial > pidgin.yaz
changeset 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 | f608b72a7611 |
| children | d2f999970f91 |
| files | ChangeLog src/conversation.c src/gtkprefs.c |
| diffstat | 3 files changed, 10 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Dec 13 23:15:41 2004 +0000 +++ b/ChangeLog Tue Dec 14 04:18:31 2004 +0000 @@ -40,6 +40,8 @@ defaulted to "Yes". * Removed "Auto-expand contacts" default to "No" * Removed conversation buttons + * Removed "Raise conversation window" preferences, default to "no" + * Removed "Show alias in tabs/titles," default to "Yes". version 1.0.2 (10/19/2004): Bug Fixes:
--- 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
--- a/src/gtkprefs.c Mon Dec 13 23:15:41 2004 +0000 +++ b/src/gtkprefs.c Tue Dec 14 04:18:31 2004 +0000 @@ -891,8 +891,6 @@ 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 @@ 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");