# HG changeset patch # User Richard Laager # Date 1227737823 0 # Node ID 05c84351338b02bad0849d0432e6672c36642f7f # Parent 8050ea54a83e0f9102a06237d715c6bd4db1d4c7# Parent 414886d7a51cd2d4d4908cd76cc5ec7d4561e2b1 propagate from branch 'im.pidgin.pidgin' (head 71b6fbd59f6ae249e6d1e8ed75dc04c9206c41a5) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head 8819fcd02c7479beb2775cc5e5f87cfdbaac7351) diff -r 414886d7a51c -r 05c84351338b libpurple/protocols/zephyr/zephyr.c --- a/libpurple/protocols/zephyr/zephyr.c Wed Nov 26 22:14:34 2008 +0000 +++ b/libpurple/protocols/zephyr/zephyr.c Wed Nov 26 22:17:03 2008 +0000 @@ -903,7 +903,7 @@ #else memcpy(ipaddr,inet_ntoa(notice.z_sender_addr),sizeof(ipaddr)); #endif - purple_conv_chat_add_user(gcc, sendertmp, ipaddr, PURPLE_CBFLAGS_NONE, TRUE); + purple_conv_chat_add_user(gcc, stripped_sender, ipaddr, PURPLE_CBFLAGS_NONE, TRUE); } g_free(sendertmp); serv_got_chat_in(gc, zt2->id, send_inst_utf8, 0, buf3, time(NULL));