pidgin: 84cac380: Break the 'if' onto two lines and don't ...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 84cac380afe8b2abc370153148fca8cac0d63178
Ancestor: 1eabe411b9ca08910b0d1e837bd36a2ed05ac3db
Author: markdoliner at pidgin.im
Date: 2009-07-13T18:44:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/84cac380afe8b2abc370153148fca8cac0d63178

Modified files:
        libpurple/protocols/jabber/message.c

ChangeLog: 

Break the 'if' onto two lines and don't bother calling jabber_id_free()
if jid is null

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/message.c	5d1e8cfe2cd2d8c42a2057793700f26366f69368
+++ libpurple/protocols/jabber/message.c	05d6f8a9c25c3062fe3693795f06484baf75ae09
@@ -644,10 +644,10 @@ void jabber_message_parse(JabberStream *
 
 							if (jid) {
 								chat = jabber_chat_find(js, jid->node, jid->domain);
-								if (chat) conv = chat->conv;
+								if (chat)
+									conv = chat->conv;
+								jabber_id_free(jid);
 							}
-
-							jabber_id_free(jid);
 						} else if (jm->type == JABBER_MESSAGE_NORMAL ||
 						           jm->type == JABBER_MESSAGE_CHAT) {
 							conv =