Mercurial > pidgin

diff src/protocols/yahoo/yahoo_filexfer.c @ 10937:ca3e0882d377

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 12721] sf patch #1202156, from Bleeter Yaluser . Forward port privacy . Tidy up whitespace . Remove file TX send limit committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 24 May 2005 04:54:27 +0000
parents f2e86683cafc
children be22eb8fa671
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo_filexfer.c	Tue May 24 04:46:51 2005 +0000
+++ b/src/protocols/yahoo/yahoo_filexfer.c	Tue May 24 04:54:27 2005 +0000
@@ -166,30 +166,23 @@
 	account = gaim_connection_get_account(gc);
 
 	if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND) {
-		if (0 && gaim_xfer_get_size(xfer) >= 1048577) {
-			gaim_notify_error(gc, NULL, _("File Transfer Failed"),
-			                  _("Gaim cannot send files over Yahoo! that are bigger than "
-			                    "One Megabyte (1,048,576 bytes)."));
-			gaim_xfer_cancel_local(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 Failed"),
+				                _("Unable to establish file descriptor."));
+				gaim_xfer_cancel_remote(xfer);
+			}
 		} else {
-			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 Failed"),
-					                _("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 Failed"),
-					                _("Unable to establish file descriptor."));
-					gaim_xfer_cancel_remote(xfer);
-				}
+			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 Failed"),
+				                _("Unable to establish file descriptor."));
+				gaim_xfer_cancel_remote(xfer);
 			}
 		}
 	} else {