[Xfce4-commits] <xfdesktop:master> Don't use deprecated api.

[Nick Schermer]

Updating branch refs/heads/master
         to a18cc34eef221056b16b2642e1936091df484dd2 (commit)
       from 61c036ac15d04403e15233fcebe2a579e2256974 (commit)

commit a18cc34eef221056b16b2642e1936091df484dd2
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Apr 15 13:53:32 2012 +0200

    Don't use deprecated api.

 src/xfdesktop-regular-file-icon.c |    4 ++++
 src/xfdesktop-special-file-icon.c |    4 ++++
 src/xfdesktop-volume-icon.c       |    8 ++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/xfdesktop-regular-file-icon.c b/src/xfdesktop-regular-file-icon.c
index f42f6d6..ff5d074 100644
--- a/src/xfdesktop-regular-file-icon.c
+++ b/src/xfdesktop-regular-file-icon.c
@@ -542,7 +542,11 @@ xfdesktop_regular_file_icon_peek_tooltip(XfdesktopIcon *icon)
 
         size = g_file_info_get_attribute_uint64(info,
                                                 G_FILE_ATTRIBUTE_STANDARD_SIZE);
+#if GLIB_CHECK_VERSION (2, 30, 0)
+        size_string = g_format_size(size);
+#else
         size_string = g_format_size_for_display(size);
+#endif
 
         mtime = g_file_info_get_attribute_uint64(info,
                                                  G_FILE_ATTRIBUTE_TIME_MODIFIED);
diff --git a/src/xfdesktop-special-file-icon.c b/src/xfdesktop-special-file-icon.c
index fa0bc0b..db4b7bc 100644
--- a/src/xfdesktop-special-file-icon.c
+++ b/src/xfdesktop-special-file-icon.c
@@ -439,7 +439,11 @@ xfdesktop_special_file_icon_peek_tooltip(XfdesktopIcon *icon)
 
             size = g_file_info_get_attribute_uint64(info,
                                                     G_FILE_ATTRIBUTE_STANDARD_SIZE);
+#if GLIB_CHECK_VERSION (2, 30, 0)
+            size_string = g_format_size(size);
+#else
             size_string = g_format_size_for_display(size);
+#endif
 
             mtime = g_file_info_get_attribute_uint64(info,
                                                      G_FILE_ATTRIBUTE_TIME_MODIFIED);
diff --git a/src/xfdesktop-volume-icon.c b/src/xfdesktop-volume-icon.c
index dce1ba2..6447e10 100644
--- a/src/xfdesktop-volume-icon.c
+++ b/src/xfdesktop-volume-icon.c
@@ -433,11 +433,15 @@ xfdesktop_volume_icon_peek_tooltip(XfdesktopIcon *icon)
 
             size = g_file_info_get_attribute_uint64(fs_info,
                                                     G_FILE_ATTRIBUTE_FILESYSTEM_SIZE);
-            size_string = g_format_size_for_display(size);
-
             free_space = g_file_info_get_attribute_uint64(fs_info,
                                                           G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
+#if GLIB_CHECK_VERSION (2, 30, 0)
+            size_string = g_format_size(size);
+            free_space_string = g_format_size(free_space);
+#else
+            size_string = g_format_size_for_display(size);
             free_space_string = g_format_size_for_display(free_space);
+#endif
 
             volume_icon->priv->tooltip =
                 g_strdup_printf(_("Removable Volume\nMounted in \"%s\"\n%s left (%s total)"),