Mercurial > pidgin
diff src/protocols/yahoo/yahoo_filexfer.c @ 7827:ee32e030c9be
[gaim-migrate @ 8479]
marv asserts that these character set conversions are more correct
than the previous yahoo conversions, which assumed that pretty much
everything was UTF-8. I believe him.
committer: Tailor Script <tailor@pidgin.im>
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Wed, 10 Dec 2003 16:48:23 +0000 |
| parents | 5f0bb52c0609 |
| children | fa6395637e2c |
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo_filexfer.c Wed Dec 10 07:37:13 2003 +0000 +++ b/src/protocols/yahoo/yahoo_filexfer.c Wed Dec 10 16:48:23 2003 +0000 @@ -189,9 +189,11 @@ struct yahoo_xfer_data *xfer_data; GaimConnection *gc; GaimAccount *account; + struct yahoo_data *yd; xfer_data = xfer->data; gc = xfer_data->gc; + yd = gc->proto_data; account = gaim_connection_get_account(gc); if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND) { @@ -200,10 +202,9 @@ yahoo_sendfile_connected, xfer) == -1) { gaim_notify_error(gc, NULL, _("File Transfer Aborted"), - _("Unable to establish file descriptor.")); + _("Unable to establish file descriptor.")); gaim_xfer_cancel_remote(xfer); } - } else { xfer->fd = gaim_proxy_connect(account, xfer_data->host, xfer_data->port, yahoo_receivefile_connected, xfer);