Updating branch refs/heads/master
to 49da17badd863b0ec4facf7b605a4a9afbe86c2f (commit)
from c8b6e07f27f102dc50fdc916719b5870de46d106 (commit)
commit 49da17badd863b0ec4facf7b605a4a9afbe86c2f
Author: Christian Dywan <[email protected]>
Date: Sun Sep 9 20:55:12 2012 +0200
Fix bogus speed display by removing old values
midori/midori-download.vala | 6 ++++--
toolbars/midori-transferbar.c | 2 --
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/midori/midori-download.vala b/midori/midori-download.vala
index ee44a9d..ce9003c 100644
--- a/midori/midori-download.vala
+++ b/midori/midori-download.vala
@@ -83,8 +83,10 @@ namespace Midori {
}
string speed;
- if (elapsed != last_time)
- speed = format_size ((int)((current_size - last_size) /
(elapsed - last_time)));
+ if (elapsed != last_time) {
+ speed = format_size ((uint64)(
+ (current_size - last_size) / (elapsed - last_time)));
+ }
else
/* i18n: Unknown number of bytes, used for transfer rate like
?B/s */
speed = _("?B");
diff --git a/toolbars/midori-transferbar.c b/toolbars/midori-transferbar.c
index 76e2c8e..81ad85a 100644
--- a/toolbars/midori-transferbar.c
+++ b/toolbars/midori-transferbar.c
@@ -213,8 +213,6 @@ midori_transferbar_add_download_item (MidoriTransferbar*
transferbar,
G_CALLBACK (midori_transferbar_download_notify_status_cb), info);
g_signal_connect (button, "clicked",
G_CALLBACK (midori_transferbar_download_button_clicked_cb), info);
- g_object_set_data_full (G_OBJECT (download), "last-time", g_new0 (gdouble,
1), g_free);
- g_object_set_data_full (G_OBJECT (download), "last-size", g_new0 (guint64,
1), g_free);
}
static void
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
