diff options
| author | Monsta <[email protected]> | 2015-01-12 16:04:13 +0300 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2015-01-13 11:55:00 +0100 |
| commit | 53ec021ce6e0ee923bd86e11b4f516b2a19bc2e8 (patch) | |
| tree | bc422498f805a6ae0b5495157a7482616ec16259 /libcaja-private/caja-file-operations.c | |
| parent | d327a96cfb61acd0ce606c4bf80349454b66bd44 (diff) | |
| download | caja-53ec021ce6e0ee923bd86e11b4f516b2a19bc2e8.tar.bz2 caja-53ec021ce6e0ee923bd86e11b4f516b2a19bc2e8.tar.xz | |
drop support for GLib < 2.36
Closes https://github.com/mate-desktop/caja/pull/372
Diffstat (limited to 'libcaja-private/caja-file-operations.c')
| -rw-r--r-- | libcaja-private/caja-file-operations.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c index e410e41f..e310de1f 100644 --- a/libcaja-private/caja-file-operations.c +++ b/libcaja-private/caja-file-operations.c @@ -68,8 +68,6 @@ #include "caja-file-conflict-dialog.h" #include "caja-undostack-manager.h" -#include <src/glibcompat.h> /* for g_list_free_full */ - /* TODO: TESTING!!! */ typedef struct { @@ -851,14 +849,10 @@ custom_size_to_string (char *format, va_list va) size = va_arg (va, goffset); - #if GLIB_CHECK_VERSION(2, 30, 0) - if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS)) - return g_format_size_full (size, G_FORMAT_SIZE_IEC_UNITS); - else - return g_format_size(size); - #else - return g_format_size_for_display(size); - #endif + if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS)) + return g_format_size_full (size, G_FORMAT_SIZE_IEC_UNITS); + else + return g_format_size(size); } static void |