summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-12-16 12:17:49 +0100
committerinfirit <[email protected]>2014-12-16 12:17:49 +0100
commit7a72f6eb6a4cfcf636760c6a6efb24ab2fb278c9 (patch)
tree5ae6d9ef2e7327d8e4ccfd91793629e969f1c868
parent1ec64aab9b6eb86e002b9e5bc8883e08c6159035 (diff)
downloadatril-7a72f6eb6a4cfcf636760c6a6efb24ab2fb278c9.tar.bz2
atril-7a72f6eb6a4cfcf636760c6a6efb24ab2fb278c9.tar.xz
Add back Glib 2.32 support
-rw-r--r--configure.ac2
-rw-r--r--shell/ev-daemon.c5
-rw-r--r--thumbnailer/atril-thumbnailer.c4
3 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index c4fa1d7a..4c4c51fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,7 +132,7 @@ AC_MSG_RESULT([$with_gtk])
dnl Specify required versions of dependencies
CAIRO_REQUIRED=1.9.10
-GLIB_REQUIRED=2.36.0
+GLIB_REQUIRED=2.32.0
LIBSECRET_REQUIRED=0.5
MATEDESKTOP_REQUIRED=1.9.0
diff --git a/shell/ev-daemon.c b/shell/ev-daemon.c
index c242e550..9f41df5d 100644
--- a/shell/ev-daemon.c
+++ b/shell/ev-daemon.c
@@ -521,6 +521,11 @@ main (gint argc, gchar **argv)
g_set_prgname ("atril-daemon");
+#if !GLIB_CHECK_VERSION (2, 36, 0)
+ g_type_init ();
+#endif
+
+
loop = g_main_loop_new (NULL, FALSE);
pending_invocations = g_hash_table_new_full (g_str_hash,
diff --git a/thumbnailer/atril-thumbnailer.c b/thumbnailer/atril-thumbnailer.c
index c3288595..ffc8e327 100644
--- a/thumbnailer/atril-thumbnailer.c
+++ b/thumbnailer/atril-thumbnailer.c
@@ -293,6 +293,10 @@ main (int argc, char *argv[])
input = file_arguments[0];
output = file_arguments[1];
+#if !GLIB_CHECK_VERSION (2, 36, 0)
+ g_type_init ();
+#endif
+
if (!ev_init ())
return -1;