Mercurial > pidgin
comparison libpurple/protocols/jabber/disco.c @ 24855:0700833f0c5d
Commit patch #7670: Implement xep-0191 (simple blocking) for jabber protocols
from Vijay Raghunathan (a co-worker of mine). We're testing this at Meebo
and it seems to work ok. Closes #7670.
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 22 Dec 2008 07:51:06 +0000 |
parents | 10382f1e1353 |
children | f0c2e27c7ae7 9195955395b6 1d3274111180 a73791d35fcc 1d1d1829de11 7d6280b006a8 |
comparison
equal
deleted
inserted
replaced
24854:95c9c306d582 | 24855:0700833f0c5d |
---|---|
353 if (js->server_caps & JABBER_CAP_ADHOC) { | 353 if (js->server_caps & JABBER_CAP_ADHOC) { |
354 /* The server supports ad-hoc commands, so let's request the list */ | 354 /* The server supports ad-hoc commands, so let's request the list */ |
355 jabber_adhoc_server_get_list(js); | 355 jabber_adhoc_server_get_list(js); |
356 } | 356 } |
357 | 357 |
358 /* If the server supports blocking, request the block list */ | |
359 if (js->server_caps & JABBER_CAP_BLOCKING) { | |
360 jabber_request_block_list(js); | |
361 } | |
362 | |
358 /* If there are manually specified bytestream proxies, query them */ | 363 /* If there are manually specified bytestream proxies, query them */ |
359 ft_proxies = purple_account_get_string(js->gc->account, "ft_proxies", NULL); | 364 ft_proxies = purple_account_get_string(js->gc->account, "ft_proxies", NULL); |
360 if (ft_proxies) { | 365 if (ft_proxies) { |
361 JabberIq *iq; | 366 JabberIq *iq; |
362 JabberBytestreamsStreamhost *sh; | 367 JabberBytestreamsStreamhost *sh; |
452 } else if (!strcmp("google:roster", var)) { | 457 } else if (!strcmp("google:roster", var)) { |
453 js->server_caps |= JABBER_CAP_GOOGLE_ROSTER; | 458 js->server_caps |= JABBER_CAP_GOOGLE_ROSTER; |
454 jabber_google_roster_init(js); | 459 jabber_google_roster_init(js); |
455 } else if (!strcmp("http://jabber.org/protocol/commands", var)) { | 460 } else if (!strcmp("http://jabber.org/protocol/commands", var)) { |
456 js->server_caps |= JABBER_CAP_ADHOC; | 461 js->server_caps |= JABBER_CAP_ADHOC; |
462 } else if (!strcmp("urn:xmpp:blocking", var)) { | |
463 js->server_caps |= JABBER_CAP_BLOCKING; | |
457 } | 464 } |
458 } | 465 } |
459 | 466 |
460 jabber_disco_finish_server_info_result_cb(js); | 467 jabber_disco_finish_server_info_result_cb(js); |
461 } | 468 } |