pidgin: dab56692: disapproval of revision 'b499ce3771edb82...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: dab5669243bb3c1e57f6a22b430a4804cb65e582
Ancestor: b499ce3771edb822dda585ef37acbafcc48b71f4
Author: datallah at pidgin.im
Date: 2008-06-14T00:59:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/dab5669243bb3c1e57f6a22b430a4804cb65e582

Modified files:
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h

ChangeLog: 

disapproval of revision 'b499ce3771edb822dda585ef37acbafcc48b71f4'
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/libxmpp.c	5c61414de3bd23433393d6e3c1f59fed8ef5ade7
+++ libpurple/protocols/jabber/libxmpp.c	b56db1a878a32e93e80e36ccaa343dc7422f18cf
@@ -76,9 +76,9 @@ static PurplePluginProtocolInfo prpl_inf
 	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 @@ static PurplePluginProtocolInfo prpl_inf
 	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 */
============================================================
--- libpurple/protocols/jabber/si.c	441145dd54aa6de5b02c19c76526ecd0f6a75a92
+++ libpurple/protocols/jabber/si.c	f839bd5f0e4e8b0d5a11bce7a92f357ec1fc37fd
@@ -1205,13 +1205,6 @@ PurpleXfer *jabber_si_new_xfer(PurpleCon
 	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 @@ void jabber_si_xfer_send(PurpleConnectio
 
 	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);
============================================================
--- libpurple/protocols/jabber/si.h	20dcb081bbd316991729ed78fd2974a846e486ec
+++ libpurple/protocols/jabber/si.h	5efdeacc163a9ff870a2234edc0678540596dc74
@@ -28,7 +28,6 @@ void jabber_si_parse(JabberStream *js, x
 
 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);