Mercurial > pidgin.yaz
changeset 27893:43b19e3dbda7
fix a reject
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sat, 27 Sep 2008 14:21:37 +0000 |
parents | d477b5b53660 |
children | f3477b0d32f4 |
files | libpurple/protocols/jabber/message.c |
diffstat | 1 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/message.c Sat Sep 27 13:28:07 2008 +0000 +++ b/libpurple/protocols/jabber/message.c Sat Sep 27 14:21:37 2008 +0000 @@ -609,7 +609,7 @@ smiley_refs = jabber_message_get_refs_from_xmlnode(child); purple_debug_info("jabber", "found %d smileys\n", g_list_length(smiley_refs)); - + if (jm->type == JABBER_MESSAGE_GROUPCHAT) { JabberID *jid = jabber_id_new(jm->from); JabberChat *chat = NULL; @@ -642,9 +642,9 @@ reformatted_xhtml = jabber_message_xml_to_string_strip_img_smileys(child); -// jm->xhtml = reformatted_xhtml; - jm->xhtml = sanitize_utf(reformatted_xhtml, - strlen(reformatted_xhtml), &len); + jm->xhtml = + sanitize_utf(reformatted_xhtml, + strlen(reformatted_xhtml), &len); /* add known custom emoticons to the conversation */ /* note: if there were no smileys in the incoming message, or @@ -655,7 +655,7 @@ const gchar *cid = ref->cid; const gchar *alt = ref->alt; - purple_debug_info("jabber", + purple_debug_info("jabber", "about to add custom smiley %s to the conv\n", alt); if (purple_conv_custom_smiley_add(conv, alt, "cid", cid, TRUE)) { @@ -663,8 +663,8 @@ jabber_data_find_remote_by_cid(cid); /* if data is already known, we add write it immediatly */ if (data) { - purple_debug_info("jabber", - "data is already known\n"); + purple_debug_info("jabber", + "data is already known\n"); purple_conv_custom_smiley_write(conv, alt, jabber_data_get_data(data), jabber_data_get_size(data)); @@ -689,7 +689,6 @@ if (*c == '\n') *c = ' '; } - g_free(tmp); } } else if(!strcmp(child->name, "active") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) { jm->chat_state = JM_STATE_ACTIVE;