From 339786f07845fc5b6de2266cf4de70ed00159f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 14 Mar 2012 19:20:22 +0000 Subject: [PATCH] build: require glib 2.28 As dieterv said, gtk 2.24 win32 binaries have been frozen on glib 2.28.x, and we dont have resources rigth now to ensure pygobject static bindings still function correctly with newer glib versions --- configure.in | 2 +- gtk/gtkfilechooserdefault.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 2a095ff866..6a35c02c9d 100644 --- a/configure.in +++ b/configure.in @@ -32,7 +32,7 @@ m4_define([gtk_api_version], [2.0]) m4_define([gtk_binary_version], [2.10.0]) # required versions of other packages -m4_define([glib_required_version], [2.30.0]) +m4_define([glib_required_version], [2.28.0]) m4_define([pango_required_version], [1.20]) m4_define([atk_required_version], [1.29.2]) m4_define([cairo_required_version], [1.6]) diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 03e5b6e26d..9533ef8b5c 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -6705,7 +6705,11 @@ file_system_model_set (GtkFileSystemModel *model, if (info == NULL || _gtk_file_info_consider_as_directory (info)) g_value_set_string (value, NULL); else +#if GLIB_CHECK_VERSION(2,30,0) g_value_take_string (value, g_format_size (g_file_info_get_size (info))); +#else + g_value_take_string (value, g_format_size_for_display (g_file_info_get_size (info))); +#endif break; case MODEL_COL_MTIME: case MODEL_COL_MTIME_TEXT: