2b5cd09e32
Update to 1.9.2 OBS-URL: https://build.opensuse.org/request/show/77335 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=112
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
commit ab7b527c5324a81271915271ae1ce20ba9964225
|
|
Author: Vincent Untz <vuntz@gnome.org>
|
|
Date: Thu Jul 28 08:56:13 2011 +0200
|
|
|
|
gvfs-copy: Do not use deprecated g_format_size_for_display()
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=655474
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 870415e..3c6d5b3 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -46,7 +46,7 @@ GTK_DOC_CHECK
|
|
DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
|
|
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
|
|
|
|
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.27.4 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 )
|
|
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.29.14 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 )
|
|
|
|
PKG_CHECK_MODULES(DBUS, dbus-1)
|
|
|
|
diff --git a/programs/gvfs-copy.c b/programs/gvfs-copy.c
|
|
index 90b8821..9caf779 100644
|
|
--- a/programs/gvfs-copy.c
|
|
+++ b/programs/gvfs-copy.c
|
|
@@ -74,7 +74,7 @@ show_progress (goffset current_num_bytes,
|
|
|
|
g_get_current_time (&tv);
|
|
|
|
- size = g_format_size_for_display (current_num_bytes / MAX (tv.tv_sec - start_time.tv_sec, 1));
|
|
+ size = g_format_size (current_num_bytes / MAX (tv.tv_sec - start_time.tv_sec, 1));
|
|
g_print (_("progress"));
|
|
g_print (" %"G_GINT64_FORMAT"/%"G_GINT64_FORMAT" (%s/s)\n",
|
|
current_num_bytes, total_num_bytes, size);
|