pidgin: 9953e3b8: jabber: Emit jabber-receiving-iq after w...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 9953e3b86db32def937899bca8dc07d159f11eae
Ancestor: c1a797052f464704b05357baf03a02769a2fd6ce
Author: darkrain42 at pidgin.im
Date: 2009-08-11T15:57:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9953e3b86db32def937899bca8dc07d159f11eae

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

ChangeLog: 

jabber: Emit jabber-receiving-iq after we've ensured id is !NULL

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/iq.c	f4f006ecf6bb663e697036070cdae072fb4d5700
+++ libpurple/protocols/jabber/iq.c	06c71c64a23459b549d4a0d7834b7ac0cdac98ca
@@ -282,11 +282,6 @@ void jabber_iq_parse(JabberStream *js, x
 	id = xmlnode_get_attrib(packet, "id");
 	iq_type = xmlnode_get_attrib(packet, "type");
 
-	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
-			"jabber-receiving-iq", js->gc, iq_type, id, from, packet));
-	if (signal_return)
-		return;
-
 	/*
 	 * child will be either the first tag child or NULL if there is no child.
 	 * Historically, we used just the 'query' subchild, but newer XEPs use
@@ -345,6 +340,11 @@ void jabber_iq_parse(JabberStream *js, x
 		return;
 	}
 
+	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
+			"jabber-receiving-iq", js->gc, iq_type, id, from, packet));
+	if (signal_return)
+		return;
+
 	/* First, lets see if a special callback got registered */
 	if(type == JABBER_IQ_RESULT || type == JABBER_IQ_ERROR) {
 		if((jcd = g_hash_table_lookup(js->iq_callbacks, id))) {