Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/disco.c @ 32827:4a34689eeb33 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged from im.pidgin.pidgin
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 19 Nov 2011 14:42:54 +0900
parents 2ec94166be43
children
comparison
equal deleted inserted replaced
32692:0f94ec89f0bc 32827:4a34689eeb33
385 if (js->server_caps & JABBER_CAP_BLOCKING) { 385 if (js->server_caps & JABBER_CAP_BLOCKING) {
386 jabber_request_block_list(js); 386 jabber_request_block_list(js);
387 } 387 }
388 388
389 /* If there are manually specified bytestream proxies, query them */ 389 /* If there are manually specified bytestream proxies, query them */
390 ft_proxies = purple_account_get_string(js->gc->account, "ft_proxies", NULL); 390 ft_proxies = purple_account_get_string(purple_connection_get_account(js->gc), "ft_proxies", NULL);
391 if (ft_proxies) { 391 if (ft_proxies) {
392 JabberIq *iq; 392 JabberIq *iq;
393 JabberBytestreamsStreamhost *sh; 393 JabberBytestreamsStreamhost *sh;
394 int i; 394 int i;
395 char *tmp; 395 char *tmp;
522 category = xmlnode_get_attrib(child, "category"); 522 category = xmlnode_get_attrib(child, "category");
523 type = xmlnode_get_attrib(child, "type"); 523 type = xmlnode_get_attrib(child, "type");
524 if(category && type && !strcmp(category, "pubsub") && !strcmp(type,"pep")) { 524 if(category && type && !strcmp(category, "pubsub") && !strcmp(type,"pep")) {
525 PurpleConnection *gc = js->gc; 525 PurpleConnection *gc = js->gc;
526 js->pep = TRUE; 526 js->pep = TRUE;
527 gc->flags |= PURPLE_CONNECTION_SUPPORT_MOODS | 527 purple_connection_set_flags(gc,
528 PURPLE_CONNECTION_SUPPORT_MOOD_MESSAGES; 528 purple_connection_get_flags(gc)
529 | PURPLE_CONNECTION_SUPPORT_MOODS
530 | PURPLE_CONNECTION_SUPPORT_MOOD_MESSAGES);
529 } 531 }
530 if (!category || strcmp(category, "server")) 532 if (!category || strcmp(category, "server"))
531 continue; 533 continue;
532 if (!type || strcmp(type, "im")) 534 if (!type || strcmp(type, "im"))
533 continue; 535 continue;