--- 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
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)"),
+ 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)"), + 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 @@
- 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)); + msg = g_strdup_printf(_("File transfer complete")); gaim_xfer_conversation_write(xfer, msg, FALSE);
@@ -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"),
+ 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"), + msg = g_strdup_printf(_("File transfer cancelled")); gaim_xfer_conversation_write(xfer, msg, FALSE);
@@ -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"),
+ 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"), + msg = g_strdup_printf(_("%s canceled the file transfer"), xfer->who); gaim_xfer_conversation_write(xfer, msg, TRUE);
gaim_xfer_error(gaim_xfer_get_type(xfer), xfer->who, msg);