Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/message.c @ 27587:5d82a9298ed5
Remove a superfluous variable.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 12 Jul 2009 05:14:32 +0000 |
parents | f1cd0395afef |
children | ed284238509b |
comparison
equal
deleted
inserted
replaced
27586:f1cd0395afef | 27587:5d82a9298ed5 |
---|---|
620 } else if(!strcmp(child->name, "html") && !strcmp(xmlns,"http://jabber.org/protocol/xhtml-im")) { | 620 } else if(!strcmp(child->name, "html") && !strcmp(xmlns,"http://jabber.org/protocol/xhtml-im")) { |
621 if(!jm->xhtml && xmlnode_get_child(child, "body")) { | 621 if(!jm->xhtml && xmlnode_get_child(child, "body")) { |
622 char *c; | 622 char *c; |
623 | 623 |
624 const PurpleConnection *gc = js->gc; | 624 const PurpleConnection *gc = js->gc; |
625 const gchar *who = xmlnode_get_attrib(packet, "from"); | |
626 PurpleAccount *account = purple_connection_get_account(gc); | 625 PurpleAccount *account = purple_connection_get_account(gc); |
627 PurpleConversation *conv = NULL; | 626 PurpleConversation *conv = NULL; |
628 GList *smiley_refs = NULL; | 627 GList *smiley_refs = NULL; |
629 gchar *reformatted_xhtml; | 628 gchar *reformatted_xhtml; |
630 | 629 |
648 jabber_id_free(jid); | 647 jabber_id_free(jid); |
649 } else if (jm->type == JABBER_MESSAGE_NORMAL || | 648 } else if (jm->type == JABBER_MESSAGE_NORMAL || |
650 jm->type == JABBER_MESSAGE_CHAT) { | 649 jm->type == JABBER_MESSAGE_CHAT) { |
651 conv = | 650 conv = |
652 purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, | 651 purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, |
653 who, account); | 652 from, account); |
654 if (!conv) { | 653 if (!conv) { |
655 /* we need to create the conversation here */ | 654 /* we need to create the conversation here */ |
656 conv = | 655 conv = |
657 purple_conversation_new(PURPLE_CONV_TYPE_IM, | 656 purple_conversation_new(PURPLE_CONV_TYPE_IM, |
658 account, who); | 657 account, from); |
659 } | 658 } |
660 } | 659 } |
661 } | 660 } |
662 | 661 |
663 /* process any newly provided smileys */ | 662 /* process any newly provided smileys */ |
698 purple_conv_custom_smiley_close(conv, alt); | 697 purple_conv_custom_smiley_close(conv, alt); |
699 } else { | 698 } else { |
700 /* we need to request the smiley (data) */ | 699 /* we need to request the smiley (data) */ |
701 purple_debug_info("jabber", | 700 purple_debug_info("jabber", |
702 "data is unknown, need to request it\n"); | 701 "data is unknown, need to request it\n"); |
703 jabber_message_send_data_request(js, conv, cid, who, | 702 jabber_message_send_data_request(js, conv, cid, from, |
704 alt); | 703 alt); |
705 } | 704 } |
706 } | 705 } |
707 g_free(ref->cid); | 706 g_free(ref->cid); |
708 g_free(ref->alt); | 707 g_free(ref->alt); |