changeset 15296:fd1a584dd5be

[gaim-migrate @ 18087] jabber_disco_finish_server_info_result_cb() should be called for other early-return cases, too. The LiveJournal djabberd server, for example, returns: <iq to='username/resource' type='result' id='gaimb0c7d562'><query xmlns='http://jabber.org/protocol/disco#info'><identity category='server' type='im' name='djabberd'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='vcard-temp'/></query></iq> which hits the early return for (!from). committer: Tailor Script <tailor@pidgin.im>
author Evan Schoenberg <evan.s@dreskin.net>
date Mon, 08 Jan 2007 12:51:23 +0000
parents 7d6bd7a4994f
children f08b43af6791
files libgaim/protocols/jabber/disco.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libgaim/protocols/jabber/disco.c	Mon Jan 08 04:26:16 2007 +0000
+++ b/libgaim/protocols/jabber/disco.c	Mon Jan 08 12:51:23 2007 +0000
@@ -238,11 +238,9 @@
 	const char *from = xmlnode_get_attrib(packet, "from");
 	const char *type = xmlnode_get_attrib(packet, "type");
 
-	if(!from || !type) {
-		return;
-	}
-
-	if(strcmp(from, js->user->domain)) {
+	if((!from || !type) ||
+	   (strcmp(from, js->user->domain))) {
+		jabber_disco_finish_server_info_result_cb(js);
 		return;
 	}