comparison: libpurple/protocols/jabber/disco.c
libpurple/protocols/jabber/disco.c
- changeset 29103
- aefa3f414775
- parent 28984
- 1d84517d56eb
- child 29247
- ca703c2df180
equal
deleted
inserted
replaced
| 29102:e26095b47b5f | 29103:aefa3f414775 |
|---|---|
| 368 jabber_vcard_fetch_mine(js); | 368 jabber_vcard_fetch_mine(js); |
| 369 | 369 |
| 370 if (js->pep) | 370 if (js->pep) |
| 371 jabber_avatar_fetch_mine(js); | 371 jabber_avatar_fetch_mine(js); |
| 372 | 372 |
| 373 if (!(js->server_caps & JABBER_CAP_GOOGLE_ROSTER)) { | 373 /* Yes, please! */ |
| 374 /* If the server supports JABBER_CAP_GOOGLE_ROSTER; we will have already requested it */ | 374 jabber_roster_request(js); |
| 375 jabber_roster_request(js); | |
| 376 } | |
| 377 | 375 |
| 378 if (js->server_caps & JABBER_CAP_ADHOC) { | 376 if (js->server_caps & JABBER_CAP_ADHOC) { |
| 379 /* The server supports ad-hoc commands, so let's request the list */ | 377 /* The server supports ad-hoc commands, so let's request the list */ |
| 380 jabber_adhoc_server_get_list(js); | 378 jabber_adhoc_server_get_list(js); |
| 381 } | 379 } |
| 553 continue; | 551 continue; |
| 554 | 552 |
| 555 if (!strcmp(NS_GOOGLE_MAIL_NOTIFY, var)) { | 553 if (!strcmp(NS_GOOGLE_MAIL_NOTIFY, var)) { |
| 556 js->server_caps |= JABBER_CAP_GMAIL_NOTIFY; | 554 js->server_caps |= JABBER_CAP_GMAIL_NOTIFY; |
| 557 jabber_gmail_init(js); | 555 jabber_gmail_init(js); |
| 558 } else if (!strcmp("google:roster", var)) { | 556 } else if (!strcmp(NS_GOOGLE_ROSTER, var)) { |
| 559 js->server_caps |= JABBER_CAP_GOOGLE_ROSTER; | 557 js->server_caps |= JABBER_CAP_GOOGLE_ROSTER; |
| 560 jabber_google_roster_init(js); | |
| 561 } else if (!strcmp("http://jabber.org/protocol/commands", var)) { | 558 } else if (!strcmp("http://jabber.org/protocol/commands", var)) { |
| 562 js->server_caps |= JABBER_CAP_ADHOC; | 559 js->server_caps |= JABBER_CAP_ADHOC; |
| 563 } else if (!strcmp(NS_SIMPLE_BLOCKING, var)) { | 560 } else if (!strcmp(NS_SIMPLE_BLOCKING, var)) { |
| 564 js->server_caps |= JABBER_CAP_BLOCKING; | 561 js->server_caps |= JABBER_CAP_BLOCKING; |
| 565 } | 562 } |
