Mercurial > pidgin.yaz
changeset 29848:f3b62076fa32
propagate from branch 'im.pidgin.pidgin' (head 3466628f7bdaf9db0a64c730ef9376b3ef78cc1d)
to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head a57df8a0eaa7ce8f5dca4d59d618a06fc0d407f2)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Wed, 26 Nov 2008 22:18:16 +0000 |
| parents | ad6d8e627444 (diff) 05c84351338b (current diff) |
| children | 93cb9f54df45 |
| 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, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/zephyr/zephyr.c Wed Nov 26 22:17:03 2008 +0000 +++ b/libpurple/protocols/zephyr/zephyr.c Wed Nov 26 22:18:16 2008 +0000 @@ -905,7 +905,6 @@ #endif 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)); g_free(send_inst_utf8);