Mercurial > pidgin3 / file diff

--- a/finch/gntxfer.c	Tue Sep 10 03:44:53 2019 -0400
+++ b/finch/gntxfer.c	Tue Sep 10 04:04:17 2019 -0400
@@ -303,8 +303,8 @@
 
 	type = purple_xfer_get_xfer_type(xfer);
 
-	size_str      = purple_str_size_to_units(purple_xfer_get_size(xfer));
-	remaining_str = purple_str_size_to_units(purple_xfer_get_bytes_remaining(xfer));
+	size_str = g_format_size(purple_xfer_get_size(xfer));
+	remaining_str = g_format_size(purple_xfer_get_bytes_remaining(xfer));
 
 	lfilename = g_path_get_basename(purple_xfer_get_local_filename(xfer));
 	utf8 = g_filename_to_utf8(lfilename, -1, NULL, NULL, NULL);
@@ -406,7 +406,7 @@
 		elapsed = now - purple_xfer_get_start_time(xfer);
 	}
 
-	kb_sent = purple_xfer_get_bytes_sent(xfer) / 1024.0;
+	kb_sent = purple_xfer_get_bytes_sent(xfer) / 1000.0;
 	kbps = (elapsed > 0 ? (kb_sent * G_USEC_PER_SEC) / elapsed : 0);
 
 	g_return_if_fail(xfer_dialog != NULL);
@@ -427,9 +427,9 @@
 	data->last_updated_time = current_time;
 
 	send = (purple_xfer_get_xfer_type(xfer) == PURPLE_XFER_TYPE_SEND);
-	size_str      = purple_str_size_to_units(purple_xfer_get_size(xfer));
-	remaining_str = purple_str_size_to_units(purple_xfer_get_bytes_remaining(xfer));
-	kbsec = g_strdup_printf(_("%.2f KiB/s"), kbps);
+	size_str = g_format_size(purple_xfer_get_size(xfer));
+	remaining_str = g_format_size(purple_xfer_get_bytes_remaining(xfer));
+	kbsec = g_strdup_printf(_("%.2f KB/s"), kbps);
 
 	gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_PROGRESS,
 			g_ascii_dtostr(prog_str, sizeof(prog_str), purple_xfer_get_progress(xfer) * 100.));