Mercurial > pidgin
comparison libgaim/protocols/jabber/disco.c @ 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 | 4bcc40bd4e20 |
children |
comparison
equal
deleted
inserted
replaced
15295:7d6bd7a4994f | 15296:fd1a584dd5be |
---|---|
236 { | 236 { |
237 xmlnode *query, *child; | 237 xmlnode *query, *child; |
238 const char *from = xmlnode_get_attrib(packet, "from"); | 238 const char *from = xmlnode_get_attrib(packet, "from"); |
239 const char *type = xmlnode_get_attrib(packet, "type"); | 239 const char *type = xmlnode_get_attrib(packet, "type"); |
240 | 240 |
241 if(!from || !type) { | 241 if((!from || !type) || |
242 return; | 242 (strcmp(from, js->user->domain))) { |
243 } | 243 jabber_disco_finish_server_info_result_cb(js); |
244 | |
245 if(strcmp(from, js->user->domain)) { | |
246 return; | 244 return; |
247 } | 245 } |
248 | 246 |
249 if(strcmp(type, "result")) { | 247 if(strcmp(type, "result")) { |
250 /* A common way to get here is for the server not to support xmlns http://jabber.org/protocol/disco#info */ | 248 /* A common way to get here is for the server not to support xmlns http://jabber.org/protocol/disco#info */ |