Mercurial > pidgin.yaz

comparison finch/gntft.c @ 30909:25e200cb3532

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
30908:c44ec533a48c 30909:25e200cb3532
381 if ((purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL) && (xfer_dialog->auto_clear)) { 381 if ((purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL) && (xfer_dialog->auto_clear)) {
382 finch_xfer_dialog_remove_xfer(xfer); 382 finch_xfer_dialog_remove_xfer(xfer);
383 return; 383 return;
384 } 384 }
385 385
386 data = FINCHXFER(xfer);
387
388 update_title_progress(); 386 update_title_progress();
389 387
390 if (purple_xfer_is_canceled(xfer)) 388 if (purple_xfer_is_canceled(xfer))
391 status = _("Canceled"); 389 status = _("Cancelled");
392 else 390 else
393 status = _("Failed"); 391 status = _("Failed");
394 392
395 gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_STATUS, status); 393 gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_STATUS, status);
396 } 394 }
400 { 398 {
401 PurpleGntXferUiData *data; 399 PurpleGntXferUiData *data;
402 char *size_str, *remaining_str; 400 char *size_str, *remaining_str;
403 time_t current_time; 401 time_t current_time;
404 char prog_str[5]; 402 char prog_str[5];
405 double kb_sent, kb_rem; 403 double kb_sent;
406 double kbps = 0.0; 404 double kbps = 0.0;
407 time_t elapsed, now; 405 time_t elapsed, now;
408 char *kbsec; 406 char *kbsec;
409 gboolean send; 407 gboolean send;
410 408
411 if ((now = purple_xfer_get_end_time(xfer)) == 0) 409 if ((now = purple_xfer_get_end_time(xfer)) == 0)
412 now = time(NULL); 410 now = time(NULL);
413 411
414 kb_sent = purple_xfer_get_bytes_sent(xfer) / 1024.0; 412 kb_sent = purple_xfer_get_bytes_sent(xfer) / 1024.0;
415 kb_rem = purple_xfer_get_bytes_remaining(xfer) / 1024.0;
416 elapsed = (purple_xfer_get_start_time(xfer) > 0 ? now - purple_xfer_get_start_time(xfer) : 0); 413 elapsed = (purple_xfer_get_start_time(xfer) > 0 ? now - purple_xfer_get_start_time(xfer) : 0);
417 kbps = (elapsed > 0 ? (kb_sent / elapsed) : 0); 414 kbps = (elapsed > 0 ? (kb_sent / elapsed) : 0);
418 415
419 g_return_if_fail(xfer_dialog != NULL); 416 g_return_if_fail(xfer_dialog != NULL);
420 g_return_if_fail(xfer != NULL); 417 g_return_if_fail(xfer != NULL);