Mercurial > pidgin.yaz
diff finch/gntft.c @ 30909:25e200cb3532
propagate from branch 'im.pidgin.pidgin' (head dca20e09164518b0f7a773edd7e9649f41d8873d)
to branch 'im.pidgin.cpw.malu.xmpp.google_refactor' (head 7823c556f2d1bbca43f5ef9f0fea30cabc5d313f)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Tue, 31 Aug 2010 18:28:10 +0000 |
| parents | 1cdae196aac8 |
| children | a8cc50c2279f |
line wrap: on
line diff
--- a/finch/gntft.c Fri Apr 09 22:14:51 2010 +0000 +++ b/finch/gntft.c Tue Aug 31 18:28:10 2010 +0000 @@ -383,12 +383,10 @@ return; } - data = FINCHXFER(xfer); - update_title_progress(); if (purple_xfer_is_canceled(xfer)) - status = _("Canceled"); + status = _("Cancelled"); else status = _("Failed"); @@ -402,7 +400,7 @@ char *size_str, *remaining_str; time_t current_time; char prog_str[5]; - double kb_sent, kb_rem; + double kb_sent; double kbps = 0.0; time_t elapsed, now; char *kbsec; @@ -412,7 +410,6 @@ now = time(NULL); kb_sent = purple_xfer_get_bytes_sent(xfer) / 1024.0; - kb_rem = purple_xfer_get_bytes_remaining(xfer) / 1024.0; elapsed = (purple_xfer_get_start_time(xfer) > 0 ? now - purple_xfer_get_start_time(xfer) : 0); kbps = (elapsed > 0 ? (kb_sent / elapsed) : 0);