[gtk+/gtk-2-24] build: require glib 2.28
- From: Javier JardÃn <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] build: require glib 2.28
- Date: Wed, 14 Mar 2012 19:36:22 +0000 (UTC)
commit 339786f07845fc5b6de2266cf4de70ed00159f1b
Author: Javier JardÃn <jjardon gnome org>
Date: Wed Mar 14 19:20:22 2012 +0000
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 deletions(-)
---
diff --git a/configure.in b/configure.in
index 2a095ff..6a35c02 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 03e5b6e..9533ef8 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:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]