gaim/gaim

Backport changes from CVS haed:
oldstatus
2005-01-03, Mark Doliner
0e346ae692db
Parents 8886acba8713
Children 3c2d126185aa
Backport changes from CVS haed:
* src/ft.c diff between revision 1.79 and 1.80
1 files changed, 41 insertions(+), 18 deletions(-)
  • +41 -18
    src/ft.c
    • --- a/src/ft.c Mon Jan 03 01:52:11 2005 -0500
    +++ b/src/ft.c Mon Jan 03 21:02:11 2005 -0500
    @@ -252,15 +252,21 @@
    /* If we have already accepted the request, ask the destination file
    name directly */
    if (gaim_xfer_get_status(xfer) != GAIM_XFER_STATUS_ACCEPTED) {
    - size = gaim_xfer_get_size(xfer);
    - size_buf = gaim_str_size_to_units(size);
    -
    - escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1);
    - buf = g_strdup_printf(_("%s wants to send you %s (%s)"),
    - xfer->who, escaped,
    - size_buf);
    - g_free(size_buf);
    - g_free(escaped);
    + if (gaim_xfer_get_filename(xfer) != NULL)
    + {
    + size = gaim_xfer_get_size(xfer);
    + size_buf = gaim_str_size_to_units(size);
    + escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1);
    + buf = g_strdup_printf(_("%s wants to send you %s (%s)"),
    + xfer->who, escaped,
    + size_buf);
    + g_free(size_buf);
    + g_free(escaped);
    + }
    + else
    + {
    + buf = g_strdup_printf(_("%s wants to send you a file"), xfer->who);
    + }
    if (xfer->message != NULL)
    serv_got_im(gaim_account_get_connection(xfer->account),
    @@ -864,8 +870,11 @@
    return;
    }
    - msg = g_strdup_printf(_("Transfer of %s complete"),
    - gaim_xfer_get_filename(xfer));
    + if (gaim_xfer_get_filename(xfer) != NULL)
    + msg = g_strdup_printf(_("Transfer of file %s complete"),
    + gaim_xfer_get_filename(xfer));
    + else
    + msg = g_strdup_printf(_("File transfer complete"));
    gaim_xfer_conversation_write(xfer, msg, FALSE);
    g_free(msg);
    @@ -911,10 +920,17 @@
    gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_CANCEL_LOCAL);
    - escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1);
    - msg = g_strdup_printf(_("You canceled the transfer of %s"),
    - escaped);
    - g_free(escaped);
    + if (gaim_xfer_get_filename(xfer) != NULL)
    + {
    + escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1);
    + msg = g_strdup_printf(_("You canceled the transfer of %s"),
    + escaped);
    + g_free(escaped);
    + }
    + else
    + {
    + msg = g_strdup_printf(_("File transfer cancelled"));
    + }
    gaim_xfer_conversation_write(xfer, msg, FALSE);
    g_free(msg);
    @@ -963,9 +979,16 @@
    gaim_request_close_with_handle(xfer);
    gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_CANCEL_REMOTE);
    - escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1);
    - msg = g_strdup_printf(_("%s canceled the transfer of %s"),
    - xfer->who, escaped);
    + if (gaim_xfer_get_filename(xfer) != NULL)
    + {
    + escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1);
    + msg = g_strdup_printf(_("%s canceled the transfer of %s"),
    + xfer->who, escaped);
    + }
    + else
    + {
    + msg = g_strdup_printf(_("%s canceled the file transfer"), xfer->who);
    + }
    g_free(escaped);
    gaim_xfer_conversation_write(xfer, msg, TRUE);
    gaim_xfer_error(gaim_xfer_get_type(xfer), xfer->who, msg);