Mercurial > pidgin

diff src/protocols/yahoo/yahoo_filexfer.c @ 9164:76125b842b23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 9949] This is proper yahoo japan support. Technically it worked before, but you had to know the yahoo japan server, and typing in nonascii didn't work. The account options are kind of ugly. Eventually Chip is going to replace the check box with something more like a dropdown thingy, that automaticly hides the settings that aren't used (Pager Host vs. Japan Pager Host, etc) But it's not too bad now. And I think I orignally wrote this patch for 0.64 or something, so I got tired of waiting. committer: Tailor Script <tailor@pidgin.im>
author Tim Ringenbach <marv@pidgin.im>
date Wed, 02 Jun 2004 03:02:50 +0000
parents ab35a0bec13a
children 9171e528d7e5
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo_filexfer.c	Wed Jun 02 01:26:21 2004 +0000
+++ b/src/protocols/yahoo/yahoo_filexfer.c	Wed Jun 02 03:02:50 2004 +0000
@@ -201,13 +201,24 @@
 			                    "One Megabyte (1,048,576 bytes)."));
 			gaim_xfer_cancel_local(xfer);
 		} else {
-			if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host",  YAHOO_XFER_HOST),
-			                       gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
-			                       yahoo_sendfile_connected, xfer) == -1)
-			{
-				gaim_notify_error(gc, NULL, _("File Transfer Aborted"),
-				                 _("Unable to establish file descriptor."));
-				gaim_xfer_cancel_remote(xfer);
+			if (yd->jp) {
+				if (gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host",  YAHOOJP_XFER_HOST),
+				                       gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
+				                       yahoo_sendfile_connected, xfer) == -1)
+				{
+					gaim_notify_error(gc, NULL, _("File Transfer Aborted"),
+					                _("Unable to establish file descriptor."));
+					gaim_xfer_cancel_remote(xfer);
+				}
+			} else {
+				if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host",  YAHOO_XFER_HOST),
+				                       gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
+				                       yahoo_sendfile_connected, xfer) == -1)
+				{
+					gaim_notify_error(gc, NULL, _("File Transfer Aborted"),
+					                _("Unable to establish file descriptor."));
+					gaim_xfer_cancel_remote(xfer);
+				}
 			}
 		}
 	} else {