Mercurial > pidgin

comparison libpurple/ft.c @ 29796:7763697a85c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 92e101e3698042e7600729bc09dec9e28f81de8f) to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head 29c3ce3e818c0e5b715ace3c2b2566976c4ea861)
author Marcus Lundblad <ml@update.uu.se>
date Mon, 24 Aug 2009 19:21:21 +0000
parents 52cb819c6668 901476dc70b9
children 0db570ed5570
comparison
equal deleted inserted replaced
29795:c138390bada8 29796:7763697a85c8
1319 purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_LOCAL); 1319 purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_LOCAL);
1320 xfer->end_time = time(NULL); 1320 xfer->end_time = time(NULL);
1321 1321
1322 if (purple_xfer_get_filename(xfer) != NULL) 1322 if (purple_xfer_get_filename(xfer) != NULL)
1323 { 1323 {
1324 msg = g_strdup_printf(_("You canceled the transfer of %s"), 1324 msg = g_strdup_printf(_("You cancelled the transfer of %s"),
1325 purple_xfer_get_filename(xfer)); 1325 purple_xfer_get_filename(xfer));
1326 } 1326 }
1327 else 1327 else
1328 { 1328 {
1329 msg = g_strdup(_("File transfer cancelled")); 1329 msg = g_strdup(_("File transfer cancelled"));
1382 account = purple_xfer_get_account(xfer); 1382 account = purple_xfer_get_account(xfer);
1383 buddy = purple_find_buddy(account, xfer->who); 1383 buddy = purple_find_buddy(account, xfer->who);
1384 1384
1385 if (purple_xfer_get_filename(xfer) != NULL) 1385 if (purple_xfer_get_filename(xfer) != NULL)
1386 { 1386 {
1387 msg = g_strdup_printf(_("%s canceled the transfer of %s"), 1387 msg = g_strdup_printf(_("%s cancelled the transfer of %s"),
1388 buddy ? purple_buddy_get_alias(buddy) : xfer->who, purple_xfer_get_filename(xfer)); 1388 buddy ? purple_buddy_get_alias(buddy) : xfer->who, purple_xfer_get_filename(xfer));
1389 } 1389 }
1390 else 1390 else
1391 { 1391 {
1392 msg = g_strdup_printf(_("%s canceled the file transfer"), 1392 msg = g_strdup_printf(_("%s cancelled the file transfer"),
1393 buddy ? purple_buddy_get_alias(buddy) : xfer->who); 1393 buddy ? purple_buddy_get_alias(buddy) : xfer->who);
1394 } 1394 }
1395 purple_xfer_conversation_write(xfer, msg, TRUE); 1395 purple_xfer_conversation_write(xfer, msg, TRUE);
1396 purple_xfer_error(purple_xfer_get_type(xfer), account, xfer->who, msg); 1396 purple_xfer_error(purple_xfer_get_type(xfer), account, xfer->who, msg);
1397 g_free(msg); 1397 g_free(msg);