Mercurial > pidgin
changeset 8942:06f47021ddd3
[gaim-migrate @ 9712]
Eradicate the "Sending message removes away status" preference.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 16 May 2004 00:39:03 +0000 |
| parents | 71fddf3f340d |
| children | 48f1b020136b |
| files | src/conversation.c src/gaimrc.c src/gtkprefs.c src/prefs.c |
| diffstat | 4 files changed, 2 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Sun May 16 00:26:08 2004 +0000 +++ b/src/conversation.c Sun May 16 00:39:03 2004 +0000 @@ -301,18 +301,6 @@ gaim_notify_error(NULL, NULL, _("Unable to send message."), NULL); } } - else { - if (err > 0 && - gaim_prefs_get_bool("/core/conversations/away_back_on_send")) { - - if (awaymessage != NULL) { - do_im_back(NULL, NULL); - } - else if (gc->away) { - serv_set_away(gc, GAIM_AWAY_CUSTOM, NULL); - } - } - } g_free(displayed); g_free(sent); @@ -2608,7 +2596,6 @@ /* Conversations */ gaim_prefs_add_none("/core/conversations"); - gaim_prefs_add_bool("/core/conversations/away_back_on_send", TRUE); gaim_prefs_add_bool("/core/conversations/use_alias_for_title", TRUE); gaim_prefs_add_bool("/core/conversations/combine_chat_im", FALSE);
--- a/src/gaimrc.c Sun May 16 00:26:08 2004 +0000 +++ b/src/gaimrc.c Sun May 16 00:39:03 2004 +0000 @@ -889,8 +889,6 @@ general_options & OPT_GEN_CHECK_SPELLING); gaim_prefs_set_bool("/gaim/gtk/conversations/chat/raise_on_events", general_options & OPT_GEN_POPUP_CHAT); - gaim_prefs_set_bool("/core/conversations/away_back_on_send", - general_options & OPT_GEN_BACK_ON_IM); gaim_prefs_set_bool("/gaim/gtk/conversations/html_shortcuts", general_options & OPT_GEN_CTL_CHARS); gaim_prefs_set_bool("/gaim/gtk/conversations/smiley_shortcuts", @@ -1132,8 +1130,6 @@ } } else if (!strcmp(p->option, "away_options")) { away_options = atoi(p->value[0]); - gaim_prefs_set_bool("/core/conversations/away_back_on_send", - away_options & OPT_AWAY_BACK_ON_IM); gaim_prefs_set_bool("/core/away/away_when_idle", away_options & OPT_AWAY_AUTO); gaim_prefs_set_bool("/core/away/auto_response/enabled",
--- a/src/gtkprefs.c Sun May 16 00:26:08 2004 +0000 +++ b/src/gtkprefs.c Sun May 16 00:39:03 2004 +0000 @@ -1612,10 +1612,6 @@ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); vbox = gaim_gtk_make_frame (ret, _("Away")); -#if 0 /* PREFSLASH04 */ - gaim_gtk_prefs_checkbox(_("_Sending messages removes away status"), - "/core/conversations/away_back_on_send", vbox); -#endif /* PREFSLASH04 */ gaim_gtk_prefs_checkbox(_("_Queue new messages when away"), "/gaim/gtk/away/queue_messages", vbox);
--- a/src/prefs.c Sun May 16 00:26:08 2004 +0000 +++ b/src/prefs.c Sun May 16 00:39:03 2004 +0000 @@ -984,6 +984,7 @@ void gaim_prefs_update_old() { /* Remove some no-longer-used prefs */ - gaim_prefs_remove("/core/conversations/im/show_login"); + gaim_prefs_remove("/core/conversations/away_back_on_send"); gaim_prefs_remove("/core/conversations/send_urls_as_links"); + gaim_prefs_remove("/core/conversations/im/show_login"); }