# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1213405175 0
# Node ID 30b5f145a0f74d6451340f99ee500b327278d194
# Parent  da78db9f188fe093fdda70bc05f577736b2e42e7# Parent  bc3ecda4039786c437578f5a303477bf208bcba4
merge of 'ba3f5db0711c5a3b7c5b5510df2e5e3ae5adbbc3'
     and 'dab5669243bb3c1e57f6a22b430a4804cb65e582'

diff -r da78db9f188f -r 30b5f145a0f7 libpurple/protocols/jabber/libxmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c	Fri Jun 13 04:57:45 2008 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Sat Jun 14 00:59:35 2008 +0000
@@ -76,9 +76,9 @@
 	jabber_roster_remove_buddy,		/* remove_buddy */
 	NULL,							/* remove_buddies */
 	NULL,							/* add_permit */
-	jabber_google_roster_add_deny,	/* add_deny */
+	jabber_google_roster_add_deny,				/* add_deny */
 	NULL,							/* rem_permit */
-	jabber_google_roster_rem_deny,	/* rem_deny */
+	jabber_google_roster_rem_deny,				/* rem_deny */
 	NULL,							/* set_permit_deny */
 	jabber_chat_join,				/* join_chat */
 	NULL,							/* reject_chat */
@@ -105,7 +105,7 @@
 	jabber_roomlist_get_list,		/* roomlist_get_list */
 	jabber_roomlist_cancel,			/* roomlist_cancel */
 	NULL,							/* roomlist_expand_category */
-	jabber_si_xfer_can_receive_file,/* can_receive_file */
+	NULL,							/* can_receive_file */
 	jabber_si_xfer_send,			/* send_file */
 	jabber_si_new_xfer,				/* new_xfer */
 	jabber_offline_message,			/* offline_message */
diff -r da78db9f188f -r 30b5f145a0f7 libpurple/protocols/jabber/si.c
--- a/libpurple/protocols/jabber/si.c	Fri Jun 13 04:57:45 2008 +0000
+++ b/libpurple/protocols/jabber/si.c	Sat Jun 14 00:59:35 2008 +0000
@@ -1205,13 +1205,6 @@
 	return xfer;
 }
 
-gboolean jabber_si_xfer_can_receive_file(PurpleConnection *conn, const char *who)
-{
-	JabberStream *js = conn->proto_data;
-
-	return purple_find_buddy(conn->account, who) && jabber_buddy_find(js, who, FALSE);
-}
-	
 void jabber_si_xfer_send(PurpleConnection *gc, const char *who, const char *file)
 {
 	JabberStream *js;
@@ -1220,7 +1213,7 @@
 
 	js = gc->proto_data;
 
-	if (!jabber_si_xfer_can_receive_file(gc, who))
+	if(!purple_find_buddy(gc->account, who) || !jabber_buddy_find(js, who, FALSE))
 		return;
 
 	xfer = jabber_si_new_xfer(gc, who);
diff -r da78db9f188f -r 30b5f145a0f7 libpurple/protocols/jabber/si.h
--- a/libpurple/protocols/jabber/si.h	Fri Jun 13 04:57:45 2008 +0000
+++ b/libpurple/protocols/jabber/si.h	Sat Jun 14 00:59:35 2008 +0000
@@ -28,7 +28,6 @@
 
 void jabber_bytestreams_parse(JabberStream *js, xmlnode *packet);
 void jabber_si_parse(JabberStream *js, xmlnode *packet);
-gboolean jabber_si_xfer_can_receive_file(PurpleConnection *conn, const char *who);
 PurpleXfer *jabber_si_new_xfer(PurpleConnection *gc, const char *who);
 void jabber_si_xfer_send(PurpleConnection *gc, const char *who, const char *file);