soc.2008.yahoo: 5471c106: Remove check of version for file transfe...

[sulabh at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 5471c106d8d3b36e260ba435b2e37fc345e3636f
Ancestor: f37a092d5ac20736349f9a7389be6826c6c32bed
Author: sulabh at soc.pidgin.im
Date: 2008-07-20T16:51:19
Branch: im.pidgin.soc.2008.yahoo
URL: http://d.pidgin.im/viewmtn/revision/info/5471c106d8d3b36e260ba435b2e37fc345e3636f

Modified files:
        libpurple/protocols/yahoo/yahoo_filexfer.c

ChangeLog: 

Remove check of version for file transfer, use only version 15 file transfer

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/yahoo_filexfer.c	cfcdf673646054ec9d28f8f0b8232d7430901cbf
+++ libpurple/protocols/yahoo/yahoo_filexfer.c	385b31f3f127a48dcf47261e2c79f809420a4e41
@@ -1043,28 +1043,16 @@ void yahoo_send_file(PurpleConnection *g
 {
 	struct yahoo_xfer_data *xfer_data;
 	struct yahoo_data *yd = gc->proto_data;
-	int ver = 0;
 	PurpleXfer *xfer = yahoo_new_xfer(gc, who);
-	YahooFriend *yf = yahoo_friend_find(gc, who);
 
-	/* To determine if we should use yahoo p15 for transfer.  Check other user's
-	 * reported version, but if we're on Yahoo Japan, ignore it. */
-	if(yf && yf->version_id > 500000 && !yd->jp)
-		ver = 15;
-	/* Default to ver 15 if user isn't a friend */
-	if(!yf)
-		ver = 15;
-
 	g_return_if_fail(xfer != NULL);
 
-	if(ver == 15) {
-		xfer_data = xfer->data;
-		xfer_data->status_15 = STARTED;
-		purple_xfer_set_init_fnc(xfer, yahoo_xfer_init_15);
-		xfer_data->version = 15;
-		xfer_data->xfer_peer_idstring = yahoo_xfer_new_xfer_id();
-		g_hash_table_insert(yd->xfer_peer_idstring_map, xfer_data->xfer_peer_idstring, xfer);
-	}
+	xfer_data = xfer->data;
+	xfer_data->status_15 = STARTED;
+	purple_xfer_set_init_fnc(xfer, yahoo_xfer_init_15);
+	xfer_data->version = 15;
+	xfer_data->xfer_peer_idstring = yahoo_xfer_new_xfer_id();
+	g_hash_table_insert(yd->xfer_peer_idstring_map, xfer_data->xfer_peer_idstring, xfer);
 
 	/* Now perform the request */
 	if (file)
@@ -1822,7 +1810,7 @@ void yahoo_process_filetrans_acc_15(Purp
 	PurpleAccount *account;
 	long val_66 = 0;
 	gchar *url = NULL;
-	int val_249;
+	int val_249 = 0;
 
 	yd = gc->proto_data;
 	for (l = pkt->hash; l; l = l->next) {