comparison: src/protocols/yahoo/yahoo_filexfer.c
src/protocols/yahoo/yahoo_filexfer.c
- changeset 14170
- f611621bc8a0
- parent 14151
- 34427f138b1f
- child 14182
- 517f4531b8a0
equal
deleted
inserted
replaced
| 14169:90d1d4697e23 | 14170:f611621bc8a0 |
|---|---|
| 261 | 261 |
| 262 if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND) { | 262 if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND) { |
| 263 if (yd->jp) { | 263 if (yd->jp) { |
| 264 if (gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST), | 264 if (gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST), |
| 265 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT), | 265 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT), |
| 266 yahoo_sendfile_connected, NULL, xfer) == NULL) | 266 yahoo_sendfile_connected, xfer) == NULL) |
| 267 { | 267 { |
| 268 gaim_notify_error(gc, NULL, _("File Transfer Failed"), | 268 gaim_notify_error(gc, NULL, _("File Transfer Failed"), |
| 269 _("Unable to establish file descriptor.")); | 269 _("Unable to establish file descriptor.")); |
| 270 gaim_xfer_cancel_remote(xfer); | 270 gaim_xfer_cancel_remote(xfer); |
| 271 } | 271 } |
| 272 } else { | 272 } else { |
| 273 if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST), | 273 if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST), |
| 274 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT), | 274 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT), |
| 275 yahoo_sendfile_connected, NULL, xfer) == NULL) | 275 yahoo_sendfile_connected, xfer) == NULL) |
| 276 { | 276 { |
| 277 gaim_notify_error(gc, NULL, _("File Transfer Failed"), | 277 gaim_notify_error(gc, NULL, _("File Transfer Failed"), |
| 278 _("Unable to establish file descriptor.")); | 278 _("Unable to establish file descriptor.")); |
| 279 gaim_xfer_cancel_remote(xfer); | 279 gaim_xfer_cancel_remote(xfer); |
| 280 } | 280 } |
| 281 } | 281 } |
| 282 } else { | 282 } else { |
| 283 /* TODO: Using xfer->fd like this is probably a bad thing... */ | 283 /* TODO: Using xfer->fd like this is probably a bad thing... */ |
| 284 if (gaim_proxy_connect(account, xfer_data->host, xfer_data->port, | 284 if (gaim_proxy_connect(account, xfer_data->host, xfer_data->port, |
| 285 yahoo_receivefile_connected, NULL, xfer) == NULL) | 285 yahoo_receivefile_connected, xfer) == NULL) |
| 286 xfer->fd = -1; | 286 xfer->fd = -1; |
| 287 else | 287 else |
| 288 xfer->fd = 0; | 288 xfer->fd = 0; |
| 289 if (xfer->fd == -1) { | 289 if (xfer->fd == -1) { |
| 290 gaim_notify_error(gc, NULL, _("File Transfer Failed"), | 290 gaim_notify_error(gc, NULL, _("File Transfer Failed"), |
