diff options
| author | infirit <[email protected]> | 2014-12-16 12:06:17 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-12-16 12:06:17 +0100 |
| commit | 5ee2c81ca6d335b18d51dbc6f1036c5f08396220 (patch) | |
| tree | 20aa58b98a797f6748bb5987558f55f37d0ec397 | |
| parent | 6e467f7fc267454b124bdb03d88b4a4a0692936f (diff) | |
| download | mate-control-center-5ee2c81ca6d335b18d51dbc6f1036c5f08396220.tar.bz2 mate-control-center-5ee2c81ca6d335b18d51dbc6f1036c5f08396220.tar.xz | |
Add back support for Glib 2.32
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | font-viewer/font-thumbnailer.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0e129039..419c996f 100644 --- a/configure.ac +++ b/configure.ac @@ -149,7 +149,7 @@ dnl ============================================== PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) COMMON_MODULES="gtk+-$GTK_API_VERSION >= $GTK_REQUIRED dnl $GMODULE_ADD dnl - glib-2.0 >= 2.36 dnl + glib-2.0 >= 2.32 dnl gthread-2.0 dnl gio-2.0 dnl gio-unix-2.0 dnl diff --git a/font-viewer/font-thumbnailer.c b/font-viewer/font-thumbnailer.c index 921d2679..9b9c833a 100644 --- a/font-viewer/font-thumbnailer.c +++ b/font-viewer/font-thumbnailer.c @@ -256,6 +256,10 @@ main(int argc, char **argv) setlocale (LC_ALL, ""); +#if !GLIB_CHECK_VERSION (2, 36, 0) + g_type_init (); +#endif + context = g_option_context_new (NULL); g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); |