Mercurial > pidgin

comparison libpurple/protocols/jabber/si.c @ 29339:356d1f40a56d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head fc93e0ea1ceae4b0e76c50e35965814711dc1c00) to branch 'im.pidgin.pidgin.next.minor' (head bca91e5200ed5372978a121437fd19fe2774c583)
author Will Thompson <will.thompson@collabora.co.uk>
date Sun, 20 Dec 2009 17:17:10 +0000
parents c4f836780e1c 6921cc1e704b
children 8f442c566ff2 1e8dc177415e
comparison
equal deleted inserted replaced
29338:f8e29cf10629 29339:356d1f40a56d
1454 who = g_strdup_printf("%s/%s", who_v[0], resource); 1454 who = g_strdup_printf("%s/%s", who_v[0], resource);
1455 g_strfreev(who_v); 1455 g_strfreev(who_v);
1456 g_free(xfer->who); 1456 g_free(xfer->who);
1457 xfer->who = who; 1457 xfer->who = who;
1458 1458
1459 if (jbr) { 1459 if (jbr && jabber_resource_know_capabilities(jbr)) {
1460 char *msg; 1460 char *msg;
1461 1461
1462 if (jabber_resource_has_capability(jbr, NS_IBB)) 1462 if (jabber_resource_has_capability(jbr, NS_IBB))
1463 jsx->stream_method |= STREAM_METHOD_IBB; 1463 jsx->stream_method |= STREAM_METHOD_IBB;
1464 if (jabber_resource_has_capability(jbr, "http://jabber.org/protocol/si/profile/file-transfer")) { 1464 if (jabber_resource_has_capability(jbr, "http://jabber.org/protocol/si/profile/file-transfer")) {