Mercurial > pidgin

comparison 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
comparison
equal deleted inserted replaced
9163:8d22bc97b7be 9164:76125b842b23
199 gaim_notify_error(gc, NULL, _("File Transfer Aborted"), 199 gaim_notify_error(gc, NULL, _("File Transfer Aborted"),
200 _("Gaim cannot send files over Yahoo! that are bigger than " 200 _("Gaim cannot send files over Yahoo! that are bigger than "
201 "One Megabyte (1,048,576 bytes).")); 201 "One Megabyte (1,048,576 bytes)."));
202 gaim_xfer_cancel_local(xfer); 202 gaim_xfer_cancel_local(xfer);
203 } else { 203 } else {
204 if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST), 204 if (yd->jp) {
205 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT), 205 if (gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST),
206 yahoo_sendfile_connected, xfer) == -1) 206 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
207 { 207 yahoo_sendfile_connected, xfer) == -1)
208 gaim_notify_error(gc, NULL, _("File Transfer Aborted"), 208 {
209 _("Unable to establish file descriptor.")); 209 gaim_notify_error(gc, NULL, _("File Transfer Aborted"),
210 gaim_xfer_cancel_remote(xfer); 210 _("Unable to establish file descriptor."));
211 gaim_xfer_cancel_remote(xfer);
212 }
213 } else {
214 if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST),
215 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
216 yahoo_sendfile_connected, xfer) == -1)
217 {
218 gaim_notify_error(gc, NULL, _("File Transfer Aborted"),
219 _("Unable to establish file descriptor."));
220 gaim_xfer_cancel_remote(xfer);
221 }
211 } 222 }
212 } 223 }
213 } else { 224 } else {
214 xfer->fd = gaim_proxy_connect(account, xfer_data->host, xfer_data->port, 225 xfer->fd = gaim_proxy_connect(account, xfer_data->host, xfer_data->port,
215 yahoo_receivefile_connected, xfer); 226 yahoo_receivefile_connected, xfer);