# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1250006274 0
# Node ID e502112a03e70142cf0b4ecf03658f4b38303307
# Parent  4c6ea36672dcfa0ad851d52b885ac729f77be862
jabber: Emit jabber-receiving-iq after we've ensured id is !NULL

diff -r 4c6ea36672dc -r e502112a03e7 libpurple/protocols/jabber/iq.c
--- a/libpurple/protocols/jabber/iq.c	Tue Aug 11 02:44:41 2009 +0000
+++ b/libpurple/protocols/jabber/iq.c	Tue Aug 11 15:57:54 2009 +0000
@@ -282,11 +282,6 @@
 	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 @@
 		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))) {