Revision 8378d82e407a747e9f5fabb7fe4a8c07dabd3e92
marv_sf at pidgin.im
marv_sf at pidgin.im
Wed Apr 11 01:21:29 EDT 2007
o -----------------------------------------------------------------
| Revision: 8378d82e407a747e9f5fabb7fe4a8c07dabd3e92
| Ancestor: 40fd615df23684ed8fdf3a0cd08400843d114014
| Author: marv_sf
| Date: 2004-12-19T21:57:32
| Branch: im.pidgin.gaim.oldstatus
|
| Modified files:
| src/protocols/yahoo/yahoo_filexfer.c
|
| ChangeLog:
|
| [gaim-migrate @ 11633]
| meh, i don't know what the limit should be, and i don't want translaters
| yelling at me about nget_text or something.
| ============================================================
| --- src/protocols/yahoo/yahoo_filexfer.c ef175082af93e384922279758102e8e37ae23666
| +++ src/protocols/yahoo/yahoo_filexfer.c 9b2561cd0f1a98faa4f6ff97719d0b3bc132dc2b
| @@ -165,31 +165,23 @@ static void yahoo_xfer_init(GaimXfer *xf
| account = gaim_connection_get_account(gc);
|
| if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND) {
| - if (0 && gaim_xfer_get_size(xfer) > 10485760) {
| - char *tmp = g_strdup_printf(_("Gaim cannot send files over Yahoo! that are bigger than "
| - "%d megabytes (%d bytes)."), 10, 10485760);
| - gaim_notify_error(gc, NULL, _("File Transfer Aborted"), tmp);
| - gaim_xfer_cancel_local(xfer);
| - g_free(tmp);
| + 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 (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);
| - }
| + 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 {
To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 8378d82e407a747e9f5fabb7fe4a8c07dabd3e92
More information about the Commits
mailing list