pidgin: 989ff728: Cannot send a file to a Yahoo! user on M...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 989ff728e6c3fb9c567d2f965dc94e272272edf4
Ancestor: c35195de7dcb61dcc6bd8b7d2ba229774dca25f3
Author: sadrul at pidgin.im
Date: 2009-11-01T03:02:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/989ff728e6c3fb9c567d2f965dc94e272272edf4

Modified files:
        libpurple/protocols/msn/msn.c

ChangeLog: 

Cannot send a file to a Yahoo! user on MSN.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msn.c	1d386d675ac35bbc41a757d53cf30b7dfaeb7d70
+++ libpurple/protocols/msn/msn.c	d435a1ddb0394f78484f94120f6829880efa2db0
@@ -634,9 +634,14 @@ msn_can_receive_file(PurpleConnection *g
 		MsnSession *session = gc->proto_data;
 		if (session) {
 			MsnUser *user = msn_userlist_find_user(session->userlist, who);
-			if (user)
+			if (user) {
 				/* Include these too: MSN_CLIENT_CAP_MSNMOBILE|MSN_CLIENT_CAP_MSNDIRECT ? */
-				ret = (user->clientid & MSN_CLIENT_CAP_WEBMSGR) == 0;
+				if ((user->clientid & MSN_CLIENT_CAP_WEBMSGR) ||
+						user->networkid == MSN_NETWORK_YAHOO)
+					ret = FALSE;
+				else
+					ret = TRUE;
+			}
 		} else
 			ret = FALSE;
 	}