drop support for GLib < 2.36

Closes https://github.com/mate-desktop/caja/pull/372

6 files changed, 18 insertions, 44 deletions

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 <libmate-desktop/mate-desktop-utils.h>
 
-#include <src/glibcompat.h> /* 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
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index 1be811f4..6a1692f4 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -35,8 +35,6 @@
 #include <libcaja-private/caja-dnd.h>
 #include <glib.h>
 
-#include <src/glibcompat.h> /* for g_list_free_full */
-
 enum
 {
     SUBDIRECTORY_UNLOADED,
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index c92e0c12..626c3836 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -61,8 +61,6 @@
 #include <libcaja-private/caja-clipboard.h>
 #include <libcaja-private/caja-cell-renderer-text-ellipsized.h>
 
-#include <src/glibcompat.h> /* for g_list_free_full */
-
 struct FMListViewDetails
 {
     GtkTreeView *tree_view;
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index c6b59efc..ba305015 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -68,8 +68,6 @@
 #include <sys/mount.h>
 #endif
 
-#include <src/glibcompat.h> /* for g_list_free_full */
-
 #define USED_FILL_R  (0.988235294 * 65535)
 #define USED_FILL_G  (0.91372549 * 65535)
 #define USED_FILL_B  (0.309803922 * 65535)
@@ -2321,14 +2319,10 @@ directory_contents_value_field_update (FMPropertiesWindow *window)
 	} else {
 		char *size_str;
 
-		#if GLIB_CHECK_VERSION(2, 30, 0)
-			if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS))
-				size_str = g_format_size_full (total_size, G_FORMAT_SIZE_IEC_UNITS);
-			else
-				size_str = g_format_size(total_size);
-		#else
-			size_str = g_format_size_for_display(total_size);
-		#endif
+		if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS))
+			size_str = g_format_size_full (total_size, G_FORMAT_SIZE_IEC_UNITS);
+		else
+			size_str = g_format_size(total_size);
 
 		text = g_strdup_printf (ngettext("%'d item, with size %s",
 						 "%'d items, totalling %s",
@@ -3147,22 +3141,16 @@ create_pie_widget (FMPropertiesWindow *window)
 	GFile *location;
 	GFileInfo *info;
 
-	#if GLIB_CHECK_VERSION(2, 30, 0)
-		if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS)) {
-			capacity = g_format_size_full(window->details->volume_capacity, G_FORMAT_SIZE_IEC_UNITS);
-			free = g_format_size_full(window->details->volume_free, G_FORMAT_SIZE_IEC_UNITS);
-			used = g_format_size_full(window->details->volume_capacity - window->details->volume_free, G_FORMAT_SIZE_IEC_UNITS);
-		}
-		else {
-			capacity = g_format_size(window->details->volume_capacity);
-			free = g_format_size(window->details->volume_free);
-			used = g_format_size(window->details->volume_capacity - window->details->volume_free);
-		}
-	#else
-		capacity = g_format_size_for_display(window->details->volume_capacity);
-		free = g_format_size_for_display(window->details->volume_free);
-		used = g_format_size_for_display(window->details->volume_capacity - window->details->volume_free);
-	#endif
+	if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS)) {
+		capacity = g_format_size_full(window->details->volume_capacity, G_FORMAT_SIZE_IEC_UNITS);
+		free = g_format_size_full(window->details->volume_free, G_FORMAT_SIZE_IEC_UNITS);
+		used = g_format_size_full(window->details->volume_capacity - window->details->volume_free, G_FORMAT_SIZE_IEC_UNITS);
+	}
+	else {
+		capacity = g_format_size(window->details->volume_capacity);
+		free = g_format_size(window->details->volume_free);
+		used = g_format_size(window->details->volume_capacity - window->details->volume_free);
+	}
 
 	file = get_original_file (window);
 
diff --git a/src/file-manager/fm-tree-model.c b/src/file-manager/fm-tree-model.c
index 604c660e..504dd89a 100644
--- a/src/file-manager/fm-tree-model.c
+++ b/src/file-manager/fm-tree-model.c
@@ -37,8 +37,6 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include <src/glibcompat.h> /* for g_list_free_full */
-
 enum
 {
     ROW_LOADED,
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index ab2f1593..f86a0634 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -55,8 +55,6 @@
 #include <libcaja-private/caja-window-info.h>
 #include <libcaja-private/caja-window-slot-info.h>
 
-#include <src/glibcompat.h> /* for g_list_free_full */
-
 typedef struct
 {
     GObject parent;