From 88214725a380c8616dbd11c0106c1a14e950f2ce Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 1 Jul 2014 14:23:44 +0200 Subject: Drop support for Glib < 2.36 --- baobab/src/baobab-prefs.c | 5 ----- baobab/src/baobab-utils.c | 8 -------- baobab/src/baobab.c | 23 ----------------------- configure.ac | 2 +- gsearchtool/gsearchtool.c | 4 ---- logview/logview-window.c | 4 ---- mate-dictionary/libgdict/gdict-defbox.c | 11 +---------- 7 files changed, 2 insertions(+), 55 deletions(-) diff --git a/baobab/src/baobab-prefs.c b/baobab/src/baobab-prefs.c index 33af5159..2c9553dc 100644 --- a/baobab/src/baobab-prefs.c +++ b/baobab/src/baobab-prefs.c @@ -248,13 +248,8 @@ fill_props_model (GtkListStore *store) fstotal = fsusage.blocks * fsusage.block_size; fsavail = fsusage.bfree * fsusage.block_size; - #if GLIB_CHECK_VERSION (2, 30, 0) total = g_format_size(fstotal); avail = g_format_size(fsavail); - #else - total = g_format_size_for_display(fstotal); - avail = g_format_size_for_display(fsavail); - #endif file = g_file_new_for_path (mountentry->mountdir); uri = g_file_get_uri (file); diff --git a/baobab/src/baobab-utils.c b/baobab/src/baobab-utils.c index 3e065350..68a6cb84 100644 --- a/baobab/src/baobab-utils.c +++ b/baobab/src/baobab-utils.c @@ -196,11 +196,7 @@ show_bars (GtkTreeModel *mdl, gtk_tree_model_get (mdl, iter, size_col, &size, -1); - #if GLIB_CHECK_VERSION (2, 30, 0) sizecstr = g_format_size (size); - #else - sizecstr = g_format_size_for_display (size); - #endif if (readelements == -1) { gtk_tree_store_set (GTK_TREE_STORE (mdl), iter, @@ -226,11 +222,7 @@ show_bars (GtkTreeModel *mdl, gtk_tree_model_get (mdl, iter, size_col, &size, -1); - #if GLIB_CHECK_VERSION (2, 30, 0) sizecstr = g_format_size (size); - #else - sizecstr = g_format_size_for_display (size); - #endif gtk_tree_store_set (GTK_TREE_STORE (mdl), iter, COL_H_PERC, 100.0, diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c index 253355ce..cb566afd 100644 --- a/baobab/src/baobab.c +++ b/baobab/src/baobab.c @@ -172,15 +172,9 @@ update_scan_label (void) gchar *available; GtkWidget *label; - #if GLIB_CHECK_VERSION (2, 30, 0) total = g_format_size (baobab.fs.total); used = g_format_size (baobab.fs.used); available = g_format_size (baobab.fs.avail); - #else - total = g_format_size_for_display (baobab.fs.total); - used = g_format_size_for_display (baobab.fs.used); - available = g_format_size_for_display (baobab.fs.avail); - #endif /* Translators: these are labels for disk space */ markup = g_markup_printf_escaped ("%s %s (%s %s %s %s )", @@ -389,11 +383,7 @@ first_row (void) gtk_tree_store_append (baobab.model, &root_iter, NULL); - #if GLIB_CHECK_VERSION (2, 30, 0) capacity_size = g_format_size (baobab.fs.total); - #else - capacity_size = g_format_size_for_display (baobab.fs.total); - #endif capacity_label = g_strdup (_("Total filesystem capacity")); gtk_tree_store_set (baobab.model, &root_iter, @@ -410,11 +400,7 @@ first_row (void) gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (baobab.tree_view), FALSE); gtk_tree_store_append (baobab.model, &firstiter, &root_iter); - #if GLIB_CHECK_VERSION (2, 30, 0) size = g_format_size (baobab.fs.used); - #else - size = g_format_size_for_display (baobab.fs.used); - #endif if (baobab.fs.total == 0 && baobab.fs.used == 0) { perc = 100.0; @@ -462,11 +448,7 @@ baobab_fill_model (struct chan_data *data) hardlinks = g_string_new (""); if (data->tempHLsize > 0) { - #if GLIB_CHECK_VERSION (2, 30, 0) size = g_format_size (data->tempHLsize); - #else - size = g_format_size_for_display (data->tempHLsize); - #endif g_string_assign (hardlinks, "("); g_string_append (hardlinks, _("contains hardlinks for:")); @@ -481,13 +463,8 @@ baobab_fill_model (struct chan_data *data) ngettext ("%5d item", "%5d items", data->elements), data->elements); - #if GLIB_CHECK_VERSION (2, 30, 0) size = g_format_size (data->size); alloc_size = g_format_size (data->alloc_size); - #else - size = g_format_size_for_display (data->size); - alloc_size = g_format_size_for_display (data->alloc_size); - #endif gtk_tree_store_set (baobab.model, &iter, COL_DIR_NAME, name, diff --git a/configure.ac b/configure.ac index e5c9c4b0..d16b1694 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,7 @@ AC_SUBST(SUN_OS) dnl pkg-config check -GLIB_REQUIRED=2.20.0 +GLIB_REQUIRED=2.36.0 GIO_REQUIRED=2.16.0 GIO_UNIX_REQUIRED=2.18.0 LIBMATE_PANEL_APPLET_REQUIRED=1.7.0 diff --git a/gsearchtool/gsearchtool.c b/gsearchtool/gsearchtool.c index a3f973be..2295884c 100644 --- a/gsearchtool/gsearchtool.c +++ b/gsearchtool/gsearchtool.c @@ -873,11 +873,7 @@ add_file_to_search_results (const gchar * file, pixbuf = get_file_pixbuf (gsearch, file_info); description = get_file_type_description (file, file_info); - #if GLIB_CHECK_VERSION(2, 30, 0) readable_size = g_format_size (g_file_info_get_size (file_info)); - #else - readable_size = g_format_size_for_display (g_file_info_get_size (file_info)); - #endif g_file_info_get_modification_time (file_info, &time_val); readable_date = get_readable_date (gsearch->search_results_date_format, time_val.tv_sec); diff --git a/logview/logview-window.c b/logview/logview-window.c index cc830a2d..0a32521d 100644 --- a/logview/logview-window.c +++ b/logview/logview-window.c @@ -212,11 +212,7 @@ logview_update_statusbar (LogviewWindow *logview, LogviewLog *active) modified = g_strdup_printf (_("last update: %s"), timestring_utf8); - #if GLIB_CHECK_VERSION (2, 30, 0) size = g_format_size (logview_log_get_file_size (active)); - #else - size = g_format_size_for_display (logview_log_get_file_size (active)); - #endif statusbar_text = g_strdup_printf (_("%d lines (%s) - %s"), logview_log_get_cached_lines_number (active), diff --git a/mate-dictionary/libgdict/gdict-defbox.c b/mate-dictionary/libgdict/gdict-defbox.c index b5618ddc..fc7697a5 100644 --- a/mate-dictionary/libgdict/gdict-defbox.c +++ b/mate-dictionary/libgdict/gdict-defbox.c @@ -52,15 +52,6 @@ #include "gdict-enum-types.h" #include "gdict-marshal.h" -/** - * G_UNICODE_COMBINING_MARK was deprecated on glib 2.30 - * use G_UNICODE_SPACING_MARK - */ - -#if !GLIB_CHECK_VERSION(2, 29, 14) - #define G_UNICODE_SPACING_MARK G_UNICODE_COMBINING_MARK -#endif - #define QUERY_MARGIN 48 #define ERROR_MARGIN 24 @@ -405,7 +396,7 @@ exact_prefix_cmp (const gchar *string, /* If string contains prefix, check that prefix is not followed * by a unicode mark symbol, e.g. that trailing 'a' in prefix * is not part of two-char a-with-hat symbol in string. */ - return type != G_UNICODE_SPACING_MARK && + return type != G_UNICODE_COMBINING_MARK && type != G_UNICODE_ENCLOSING_MARK && type != G_UNICODE_NON_SPACING_MARK; } -- cgit v1.2.1