Mercurial > pidgin
changeset 29453:05c84351338b
propagate from branch 'im.pidgin.pidgin' (head 71b6fbd59f6ae249e6d1e8ed75dc04c9206c41a5)
to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head 8819fcd02c7479beb2775cc5e5f87cfdbaac7351)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Wed, 26 Nov 2008 22:17:03 +0000 |
| parents | 8050ea54a83e (diff) 414886d7a51c (current diff) |
| children | f3b62076fa32 |
| files | pidgin/pixmaps/emblems/16/mobile.png pidgin/pixmaps/emotes/default/24/eat.png pidgin/pixmaps/emotes/default/24/in-love.png pidgin/pixmaps/emotes/default/24/love.png pidgin/pixmaps/emotes/default/24/nailbiting.png pidgin/pixmaps/emotes/default/24/shock.png pidgin/pixmaps/emotes/default/24/smile-big.png pidgin/pixmaps/emotes/default/24/smile.png pidgin/pixmaps/emotes/default/24/sweat.png pidgin/pixmaps/emotes/default/24/tremble.png pidgin/pixmaps/emotes/default/24/yawn.png pidgin/pixmaps/emotes/small/16/love.png pidgin/pixmaps/emotes/small/16/shock.png pidgin/pixmaps/emotes/small/16/smile-big.png pidgin/pixmaps/emotes/small/16/smile.png pidgin/pixmaps/emotes/small/16/yawn.png |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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));