Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/disco.c @ 26062:f0c2e27c7ae7
propagate from branch 'im.pidgin.pidgin' (head b478b184a46116ac87ac85b8cd352ea564224019)
to branch 'im.pidgin.pidgin.vv' (head 6ace5b357bd34d1a93fad3fcf59b31f846c64e0b)
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Fri, 02 Jan 2009 23:14:27 +0000 |
parents | bee5ab815291 0700833f0c5d |
children | 88f183f7dfc7 |
comparison
equal
deleted
inserted
replaced
26061:ee2a2a9dda01 | 26062:f0c2e27c7ae7 |
---|---|
364 if (js->server_caps & JABBER_CAP_ADHOC) { | 364 if (js->server_caps & JABBER_CAP_ADHOC) { |
365 /* The server supports ad-hoc commands, so let's request the list */ | 365 /* The server supports ad-hoc commands, so let's request the list */ |
366 jabber_adhoc_server_get_list(js); | 366 jabber_adhoc_server_get_list(js); |
367 } | 367 } |
368 | 368 |
369 /* If the server supports blocking, request the block list */ | |
370 if (js->server_caps & JABBER_CAP_BLOCKING) { | |
371 jabber_request_block_list(js); | |
372 } | |
373 | |
369 /* If there are manually specified bytestream proxies, query them */ | 374 /* If there are manually specified bytestream proxies, query them */ |
370 ft_proxies = purple_account_get_string(js->gc->account, "ft_proxies", NULL); | 375 ft_proxies = purple_account_get_string(js->gc->account, "ft_proxies", NULL); |
371 if (ft_proxies) { | 376 if (ft_proxies) { |
372 JabberIq *iq; | 377 JabberIq *iq; |
373 JabberBytestreamsStreamhost *sh; | 378 JabberBytestreamsStreamhost *sh; |
463 } else if (!strcmp("google:roster", var)) { | 468 } else if (!strcmp("google:roster", var)) { |
464 js->server_caps |= JABBER_CAP_GOOGLE_ROSTER; | 469 js->server_caps |= JABBER_CAP_GOOGLE_ROSTER; |
465 jabber_google_roster_init(js); | 470 jabber_google_roster_init(js); |
466 } else if (!strcmp("http://jabber.org/protocol/commands", var)) { | 471 } else if (!strcmp("http://jabber.org/protocol/commands", var)) { |
467 js->server_caps |= JABBER_CAP_ADHOC; | 472 js->server_caps |= JABBER_CAP_ADHOC; |
473 } else if (!strcmp("urn:xmpp:blocking", var)) { | |
474 js->server_caps |= JABBER_CAP_BLOCKING; | |
468 } | 475 } |
469 } | 476 } |
470 | 477 |
471 jabber_disco_finish_server_info_result_cb(js); | 478 jabber_disco_finish_server_info_result_cb(js); |
472 } | 479 } |