Mercurial > pidgin
diff src/protocols/yahoo/yahoo_filexfer.c @ 10654:f2e86683cafc
[gaim-migrate @ 12182]
sf patch #1152664, from Richard Laager
This patches does three things:
First, it uses aliases in file transfer messages
whenever possible.
Second, it fixes the case where file transfer
completion messages are not showing for MSN.
Third, it makes the wording more consistent:
Canceled is used to describe cases when the file
transfer was actively canceled by either party.
Failed is used otherwise. Aborted is no longer
used at all. Previously, aborted was used in
some places while failed was used under the
same circumstances in other places. Also,
in the file transfer box, canceled was used in
one place for remotely or locally canceled
files while in another place in the same box
canceled was only used for locally canceled
files (failed was used for remotely canceled
files).
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 06 Mar 2005 00:23:54 +0000 |
| parents | 8fbab42659c2 |
| children | ca3e0882d377 |
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo_filexfer.c Sun Mar 06 00:10:54 2005 +0000 +++ b/src/protocols/yahoo/yahoo_filexfer.c Sun Mar 06 00:23:54 2005 +0000 @@ -66,7 +66,8 @@ if (!(xd = xfer->data)) return; if (source < 0) { - gaim_xfer_error(GAIM_XFER_RECEIVE, xfer->who, _("Unable to connect.")); + gaim_xfer_error(GAIM_XFER_RECEIVE, gaim_xfer_get_account(xfer), + xfer->who, _("Unable to connect.")); gaim_xfer_cancel_remote(xfer); return; } @@ -109,7 +110,8 @@ if (source < 0) { - gaim_xfer_error(GAIM_XFER_RECEIVE, xfer->who, _("Unable to connect.")); + gaim_xfer_error(GAIM_XFER_RECEIVE, gaim_xfer_get_account(xfer), + xfer->who, _("Unable to connect.")); gaim_xfer_cancel_remote(xfer); return; } @@ -165,7 +167,7 @@ if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND) { if (0 && gaim_xfer_get_size(xfer) >= 1048577) { - gaim_notify_error(gc, NULL, _("File Transfer Aborted"), + 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); @@ -175,7 +177,7 @@ gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT), yahoo_sendfile_connected, xfer) == -1) { - gaim_notify_error(gc, NULL, _("File Transfer Aborted"), + gaim_notify_error(gc, NULL, _("File Transfer Failed"), _("Unable to establish file descriptor.")); gaim_xfer_cancel_remote(xfer); } @@ -184,7 +186,7 @@ gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT), yahoo_sendfile_connected, xfer) == -1) { - gaim_notify_error(gc, NULL, _("File Transfer Aborted"), + gaim_notify_error(gc, NULL, _("File Transfer Failed"), _("Unable to establish file descriptor.")); gaim_xfer_cancel_remote(xfer); } @@ -194,7 +196,7 @@ xfer->fd = gaim_proxy_connect(account, xfer_data->host, xfer_data->port, yahoo_receivefile_connected, xfer); if (xfer->fd == -1) { - gaim_notify_error(gc, NULL, _("File Transfer Aborted"), + gaim_notify_error(gc, NULL, _("File Transfer Failed"), _("Unable to establish file descriptor.")); gaim_xfer_cancel_remote(xfer); }