pidgin: 4fff88c1: The jabber_register_parse function was l...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 4fff88c1ced759af0eb5b037725dc81419b893e3
Ancestor: b4f7c92c27855a09f126ea92e7240e493dd37f4b
Author: qulogic at pidgin.im
Date: 2009-02-07T23:45:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4fff88c1ced759af0eb5b037725dc81419b893e3

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

ChangeLog: 

The jabber_register_parse function was looking for the <x> node as a
child of the <iq> node instead of the <query> node. (See Chs 4 & 5 of
XEP-0077)
Somebody (maybe it'll be me?) should probably check that the code for these
two cases does what it's supposed to, since I don't think it would have run
before now. It also looks like the precedence may be wrong (See Ch 6).

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	cad41bf7f2dadca3ef77f90d44ae139f7dd16d37
+++ libpurple/protocols/jabber/jabber.c	687026e2691399edddca701e1ed503668fc1feaf
@@ -1021,11 +1021,11 @@ void jabber_register_parse(JabberStream 
 		}
 	}
 	
-	if((x = xmlnode_get_child_with_namespace(packet, "x", "jabber:x:data"))) {
+	if((x = xmlnode_get_child_with_namespace(query, "x", "jabber:x:data"))) {
 		jabber_x_data_request(js, x, jabber_register_x_data_cb, g_strdup(from));
 		return;
 
-	} else if((x = xmlnode_get_child_with_namespace(packet, "x", "jabber:x:oob"))) {
+	} else if((x = xmlnode_get_child_with_namespace(query, "x", "jabber:x:oob"))) {
 		xmlnode *url;
 
 		if((url = xmlnode_get_child(x, "url"))) {