Mercurial > pidgin.yaz
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/disco.c Tue Dec 16 02:11:07 2008 +0000 +++ b/libpurple/protocols/jabber/disco.c Fri Jan 02 23:14:27 2009 +0000 @@ -366,6 +366,11 @@ jabber_adhoc_server_get_list(js); } + /* If the server supports blocking, request the block list */ + if (js->server_caps & JABBER_CAP_BLOCKING) { + jabber_request_block_list(js); + } + /* If there are manually specified bytestream proxies, query them */ ft_proxies = purple_account_get_string(js->gc->account, "ft_proxies", NULL); if (ft_proxies) { @@ -465,6 +470,8 @@ jabber_google_roster_init(js); } else if (!strcmp("http://jabber.org/protocol/commands", var)) { js->server_caps |= JABBER_CAP_ADHOC; + } else if (!strcmp("urn:xmpp:blocking", var)) { + js->server_caps |= JABBER_CAP_BLOCKING; } }