comparison libgaim/protocols/jabber/disco.c @ 15297: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 <[e-mail]>

15296:7d6bd7a4994f

{
  	xmlnode *query, *child;
	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)) {
		return;
	}

	if(strcmp(type, "result")) {
		/* A common way to get here is for the server not to support xmlns http://jabber.org/protocol/disco#info */

15297:fd1a584dd5be

{
  	xmlnode *query, *child;
	const char *from = xmlnode_get_attrib(packet, "from");
	const char *type = xmlnode_get_attrib(packet, "type");

	if((!from || !type) ||
	   (strcmp(from, js->user->domain))) {
		jabber_disco_finish_server_info_result_cb(js);
		return;
	}

	if(strcmp(type, "result")) {
		/* A common way to get here is for the server not to support xmlns http://jabber.org/protocol/disco#info */