diff options
author | Christian Kellner <gicmo@src.gnome.org> | 2008-09-01 10:53:00 +0000 |
---|---|---|
committer | Christian Kellner <gicmo@src.gnome.org> | 2008-09-01 10:53:00 +0000 |
commit | 7afb8438c184839e43f81341578e8c6c40d5883f (patch) | |
tree | 36d6b4085b4174c553b6908b3643155096a6933c | |
parent | 71ad23156666e17da4863004f6a5e080b53b7c39 (diff) | |
download | gvfs-7afb8438c184839e43f81341578e8c6c40d5883f.tar.gz |
Use g_format_size_for_display (Bug #550100)
svn path=/trunk/; revision=1921
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | monitor/hal/ghalvolume.c | 33 |
2 files changed, 9 insertions, 31 deletions
@@ -1,3 +1,10 @@ +2008-09-01 Christian Kellner <gicmo@gnome.org> + + * monitor/hal/ghalvolume.c: (do_update_from_hal): + Use g_format_size_for_display for consistency. + Patch from Christian Persch <chpe@gnome.org> + Fixes bug #550100 + 2008-08-30 Matthias Clasen <mclasen@redhat.com> * common/gmountspec.c (g_mount_spec_from_dbus): Plug a tiny diff --git a/monitor/hal/ghalvolume.c b/monitor/hal/ghalvolume.c index 4c9e43f5..9cb00965 100644 --- a/monitor/hal/ghalvolume.c +++ b/monitor/hal/ghalvolume.c @@ -136,35 +136,6 @@ changed_in_idle (gpointer data) return FALSE; } -#define KILOBYTE_FACTOR 1000.0 -#define MEGABYTE_FACTOR (1000.0 * 1000.0) -#define GIGABYTE_FACTOR (1000.0 * 1000.0 * 1000.0) - -static char * -format_size_for_display (guint64 size) -{ - char *str; - gdouble displayed_size; - - if (size < MEGABYTE_FACTOR) - { - displayed_size = (double) size / KILOBYTE_FACTOR; - str = g_strdup_printf (_("%.1f kB"), displayed_size); - } - else if (size < GIGABYTE_FACTOR) - { - displayed_size = (double) size / MEGABYTE_FACTOR; - str = g_strdup_printf (_("%.1f MB"), displayed_size); - } - else - { - displayed_size = (double) size / GIGABYTE_FACTOR; - str = g_strdup_printf (_("%.1f GB"), displayed_size); - } - - return str; -} - static void do_update_from_hal (GHalVolume *mv) { @@ -216,7 +187,7 @@ do_update_from_hal (GHalVolume *mv) { if (strcmp (volume_fsusage, "crypto") == 0 && strcmp (volume_fstype, "crypto_LUKS") == 0) { - size = format_size_for_display (volume_size); + size = g_format_size_for_display (volume_size); /* Translators: %s is the size of the volume (e.g. 512 MB) */ name = g_strdup_printf (_("%s Encrypted Data"), size); g_free (size); @@ -239,7 +210,7 @@ do_update_from_hal (GHalVolume *mv) } else { - size = format_size_for_display (volume_size); + size = g_format_size_for_display (volume_size); /* Translators: %s is the size of the volume (e.g. 512 MB) */ name = g_strdup_printf (_("%s Media"), size); g_free (size); |