# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1138599228 0
# Node ID e84e4e56f8f6610368e34fa63d41311e6931edb8
# Parent  5a0f978674ad1a2a4fced39f6f7531a5a4d49396
[gaim-migrate @ 15433]
Some oscar changes from Jonathan Clark that
"1) Resolves a looping issue when interacting with the joscar library
    (now in use on Adium)
 2) Adds an account option for turning on/off proxied file transfers.
    I'm hoping to come up with a good way of eliminating this option
    all together soon."

committer: Tailor Script <tailor@pidgin.im>

diff -r 5a0f978674ad -r e84e4e56f8f6 src/protocols/oscar/aim.h
--- a/src/protocols/oscar/aim.h	Mon Jan 30 05:10:32 2006 +0000
+++ b/src/protocols/oscar/aim.h	Mon Jan 30 05:33:48 2006 +0000
@@ -990,6 +990,7 @@
 	int method; /* What method is being used to transfer this file? DIRECT, REDIR, or PROXY */
 	int stage; /* At what stage was a proxy requested? NONE, STG1, STG2*/
 	int xfer_reffed; /* There are many timers, but we should only ref the xfer once */
+	int redir_attempted; /* Have we previously attempted to redirect the connection? */
 	fu32_t res_bytes; /* The bytes already received for resuming a transfer */
 
 	aim_conn_t *conn;
diff -r 5a0f978674ad -r e84e4e56f8f6 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Mon Jan 30 05:10:32 2006 +0000
+++ b/src/protocols/oscar/oscar.c	Mon Jan 30 05:33:48 2006 +0000
@@ -66,6 +66,7 @@
 #define OSCAR_DEFAULT_AUTHORIZATION TRUE
 #define OSCAR_DEFAULT_HIDE_IP TRUE
 #define OSCAR_DEFAULT_WEB_AWARE FALSE
+#define OSCAR_DEFAULT_USE_RV_PROXY TRUE
 
 /* Milliseconds each file transfer ip address will be given to make a connection. */
 #define FT_CLIENTIP_TIMEOUT	1000	/* 5000 */
@@ -2099,9 +2100,14 @@
 					&& g_ascii_strcasecmp(oft_info->clientip, oft_info->verifiedip) != 0 )
 				{
 					/* The verifiedip timed out */
-					if(oft_info->method == AIM_XFER_DIRECT) {
+					if (oft_info->method == AIM_XFER_DIRECT && !oft_info->redir_attempted)
+					{
 						/* clientip & verifiedip failed, request a redirect
-						* that is, we want the sender to connect to us */
+						 * that is, we want the sender to connect to us
+						 *
+						 * Above, we checked if we had previously attempted a connection
+						 * redirect to prevent a conflict with the joscar library
+						 */
 
 						/* Let the user not to lose hope quite yet*/
 						msg = g_strdup_printf(_("Attempting connection redirect..."));
@@ -2111,6 +2117,7 @@
 						gaim_timeout_add(FT_REDIR_TIMEOUT,
 							oscar_xfer_ip_timeout, xfer);
 						oft_info->method = AIM_XFER_REDIR;
+						oft_info->redir_attempted = TRUE;
 						g_free(oft_info->proxyip);
 						oft_info->proxyip = NULL;
 						oft_info->clientip = g_strdup( gaim_network_get_my_ip(
@@ -2148,8 +2155,8 @@
 				/* proxyip timed out
 				 * Yes, it's a bit odd to ask the user to enable proxied file transfers
 				 * when it's a proxied transfer that timed out. It is possible that a
-				 * stage 1/2 proxied transfer might work when a stage 3 will not. */
-				msg = g_strdup_printf(_("Transfer of file %s timed out.\n Try enabling proxy servers for file transfers in Tools->Preferences->AIM/ICQ."),
+				 * stage 1 or 2 proxied transfer might work when a stage 3 will not. */
+				msg = g_strdup_printf(_("Transfer of file %s timed out.\n Try enabling proxy servers for file transfers in Accounts->Your Account->Edit Account->Advanced."),
 					gaim_xfer_get_filename(xfer));
 				gaim_xfer_conversation_write(xfer, msg, TRUE);
 				g_free(msg);
@@ -2714,6 +2721,7 @@
 		{
 			return TRUE;
 		}
+
 	}
 
 	return FALSE;
@@ -8566,13 +8574,13 @@
 	ppref = gaim_plugin_pref_new_with_name_and_label("/plugins/prpl/oscar/show_idle", _("Show how long you have been idle"));
 	gaim_plugin_pref_frame_add(frame, ppref);
 #endif
-	
+
 	ppref = gaim_plugin_pref_new_with_label(_("File Transfers"));
 	gaim_plugin_pref_frame_add(frame, ppref);
 
 	ppref = gaim_plugin_pref_new_with_name_and_label(
 			    "/plugins/prpl/oscar/use_rv_proxy",
-			    _("Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"));
+			    _("Use AIM/ICQ proxy server (slower, but usually works)"));
 	gaim_plugin_pref_frame_add(frame, ppref);
 
 	return frame;
@@ -8734,6 +8742,11 @@
 
 	option = gaim_account_option_string_new(_("Encoding"), "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+	
+	option = gaim_account_option_bool_new(
+		_("Use AIM/ICQ proxy server\nSlower/More Secure/Usually Works)"), "use_rv_proxy",
+		OSCAR_DEFAULT_USE_RV_PROXY);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	/* Preferences */
 	gaim_prefs_add_none("/plugins/prpl/oscar");