From 53ec021ce6e0ee923bd86e11b4f516b2a19bc2e8 Mon Sep 17 00:00:00 2001 From: Monsta Date: Mon, 12 Jan 2015 16:04:13 +0300 Subject: drop support for GLib < 2.36 Closes https://github.com/mate-desktop/caja/pull/372 --- src/file-manager/fm-directory-view.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/file-manager/fm-directory-view.c') diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 7efa3494..ebf80eb3 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -86,8 +86,6 @@ #define MATE_DESKTOP_USE_UNSTABLE_API #include -#include /* for g_list_free_full */ - /* Minimum starting update inverval */ #define UPDATE_INTERVAL_MIN 100 /* Maximum update interval */ @@ -2329,14 +2327,10 @@ fm_directory_view_display_selection_info (FMDirectoryView *view) if (non_folder_size_known) { char *size_string; - #if GLIB_CHECK_VERSION(2, 30, 0) - if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS)) - size_string = g_format_size_full (non_folder_size, G_FORMAT_SIZE_IEC_UNITS); - else - size_string = g_format_size(non_folder_size); - #else - size_string = g_format_size_for_display(non_folder_size); - #endif + if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS)) + size_string = g_format_size_full (non_folder_size, G_FORMAT_SIZE_IEC_UNITS); + else + size_string = g_format_size(non_folder_size); /* This is marked for translation in case a localiser * needs to use something other than parentheses. The -- cgit v1.2.1