# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1260483001 0
# Node ID ebba905f197103eec4522ff5c84f3f597fc0f03c
# Parent  6921cc1e704b30377c67f5f5c33078487f32bcf8# Parent  531a3571f96dda10fe2dfa552aecfc49d8ac4365
merge of '23403faa17b752c8e88650199945fbd8843f3796'
     and 'a7ad73861fcd2493b36ea5341495c336c5cfcc33'

diff -r 531a3571f96d -r ebba905f1971 libpurple/protocols/jabber/si.c
--- a/libpurple/protocols/jabber/si.c	Thu Dec 10 21:40:13 2009 +0000
+++ b/libpurple/protocols/jabber/si.c	Thu Dec 10 22:10:01 2009 +0000
@@ -1448,7 +1448,7 @@
 	g_free(xfer->who);
 	xfer->who = who;
 
-	if (jbr && jbr->caps.info) {
+	if (jbr && jabber_resource_know_capabilities(jbr)) {
 		char *msg;
 
 		if (jabber_resource_has_capability(jbr, NS_IBB))