Mercurial > pidgin.yaz
changeset 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 |
files | libpurple/protocols/jabber/message.c |
diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/message.c Sun Jul 12 05:07:09 2009 +0000 +++ b/libpurple/protocols/jabber/message.c Sun Jul 12 05:14:32 2009 +0000 @@ -622,7 +622,6 @@ char *c; const PurpleConnection *gc = js->gc; - const gchar *who = xmlnode_get_attrib(packet, "from"); PurpleAccount *account = purple_connection_get_account(gc); PurpleConversation *conv = NULL; GList *smiley_refs = NULL; @@ -650,12 +649,12 @@ jm->type == JABBER_MESSAGE_CHAT) { conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, - who, account); + from, account); if (!conv) { /* we need to create the conversation here */ conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, - account, who); + account, from); } } } @@ -700,7 +699,7 @@ /* we need to request the smiley (data) */ purple_debug_info("jabber", "data is unknown, need to request it\n"); - jabber_message_send_data_request(js, conv, cid, who, + jabber_message_send_data_request(js, conv, cid, from, alt); } }