Mercurial > pidgin.yaz
comparison libpurple/ft.c @ 29693:7925bb7f2aa7
propagate from branch 'im.pidgin.pidgin' (head 92e101e3698042e7600729bc09dec9e28f81de8f)
to branch 'im.pidgin.cpw.attention_ui' (head 563c35d20efcc234a74567ebb88c059d10ce1e09)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 24 Aug 2009 19:23:56 +0000 |
parents | 901476dc70b9 |
children | 53aab96e61a9 7763697a85c8 |
comparison
equal
deleted
inserted
replaced
29692:fb99a0067812 | 29693:7925bb7f2aa7 |
---|---|
1311 purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_LOCAL); | 1311 purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_LOCAL); |
1312 xfer->end_time = time(NULL); | 1312 xfer->end_time = time(NULL); |
1313 | 1313 |
1314 if (purple_xfer_get_filename(xfer) != NULL) | 1314 if (purple_xfer_get_filename(xfer) != NULL) |
1315 { | 1315 { |
1316 msg = g_strdup_printf(_("You canceled the transfer of %s"), | 1316 msg = g_strdup_printf(_("You cancelled the transfer of %s"), |
1317 purple_xfer_get_filename(xfer)); | 1317 purple_xfer_get_filename(xfer)); |
1318 } | 1318 } |
1319 else | 1319 else |
1320 { | 1320 { |
1321 msg = g_strdup(_("File transfer cancelled")); | 1321 msg = g_strdup(_("File transfer cancelled")); |
1374 account = purple_xfer_get_account(xfer); | 1374 account = purple_xfer_get_account(xfer); |
1375 buddy = purple_find_buddy(account, xfer->who); | 1375 buddy = purple_find_buddy(account, xfer->who); |
1376 | 1376 |
1377 if (purple_xfer_get_filename(xfer) != NULL) | 1377 if (purple_xfer_get_filename(xfer) != NULL) |
1378 { | 1378 { |
1379 msg = g_strdup_printf(_("%s canceled the transfer of %s"), | 1379 msg = g_strdup_printf(_("%s cancelled the transfer of %s"), |
1380 buddy ? purple_buddy_get_alias(buddy) : xfer->who, purple_xfer_get_filename(xfer)); | 1380 buddy ? purple_buddy_get_alias(buddy) : xfer->who, purple_xfer_get_filename(xfer)); |
1381 } | 1381 } |
1382 else | 1382 else |
1383 { | 1383 { |
1384 msg = g_strdup_printf(_("%s canceled the file transfer"), | 1384 msg = g_strdup_printf(_("%s cancelled the file transfer"), |
1385 buddy ? purple_buddy_get_alias(buddy) : xfer->who); | 1385 buddy ? purple_buddy_get_alias(buddy) : xfer->who); |
1386 } | 1386 } |
1387 purple_xfer_conversation_write(xfer, msg, TRUE); | 1387 purple_xfer_conversation_write(xfer, msg, TRUE); |
1388 purple_xfer_error(purple_xfer_get_type(xfer), account, xfer->who, msg); | 1388 purple_xfer_error(purple_xfer_get_type(xfer), account, xfer->who, msg); |
1389 g_free(msg); | 1389 g_free(msg); |