Mercurial > pidgin.yaz
changeset 1371:1136f7896eeb
[gaim-migrate @ 1381]
this should fix the ICQ non-alias bug
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Thu, 04 Jan 2001 22:20:58 +0000 |
| parents | 776bb4c6c0b8 |
| children | 153eb28ea454 |
| files | src/server.c |
| diffstat | 1 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/server.c Thu Jan 04 21:59:35 2001 +0000 +++ b/src/server.c Thu Jan 04 22:20:58 2001 +0000 @@ -331,6 +331,11 @@ } cnv = find_conversation(name); + if (cnv) { + cnv->gc = gc; + gtk_option_menu_set_history(GTK_OPTION_MENU(cnv->menu), g_slist_index(connections, gc)); + update_buttons_by_protocol(cnv); + } if (general_options & OPT_GEN_SEND_LINKS) { linkify_text(message); @@ -344,9 +349,12 @@ if (cnv == NULL) { new_conv = 1; cnv = new_conversation(name); + cnv->gc = gc; + gtk_option_menu_set_history(GTK_OPTION_MENU(cnv->menu), + g_slist_index(connections, gc)); + update_buttons_by_protocol(cnv); } - } - else { + } else { return; } if (cnv != NULL) { @@ -358,6 +366,10 @@ if (cnv == NULL) { new_conv = 1; cnv = new_conversation(name); + cnv->gc = gc; + gtk_option_menu_set_history(GTK_OPTION_MENU(cnv->menu), + g_slist_index(connections, gc)); + update_buttons_by_protocol(cnv); } if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV)) { play_sound(FIRST_RECEIVE); @@ -369,9 +381,6 @@ } - cnv->gc = gc; - gtk_option_menu_set_history(GTK_OPTION_MENU(cnv->menu), g_slist_index(connections, gc)); - update_buttons_by_protocol(cnv); if (awaymessage != NULL) {