summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-12-16 13:10:41 +0100
committerinfirit <[email protected]>2014-12-16 13:10:41 +0100
commit4599ff1d32a8c0a9633b9d4a3636166c5d060508 (patch)
tree7581d5fbe5c89bdc2f194b1c9e539d4d0e0ed1ae
parent7a72f6eb6a4cfcf636760c6a6efb24ab2fb278c9 (diff)
downloadatril-4599ff1d32a8c0a9633b9d4a3636166c5d060508.tar.bz2
atril-4599ff1d32a8c0a9633b9d4a3636166c5d060508.tar.xz
Revert "Add back Glib 2.32 support"
This reverts commit 7a72f6eb6a4cfcf636760c6a6efb24ab2fb278c9.
-rw-r--r--configure.ac2
-rw-r--r--shell/ev-daemon.c5
-rw-r--r--thumbnailer/atril-thumbnailer.c4
3 files changed, 1 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 4c4c51fc..c4fa1d7a 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.32.0
+GLIB_REQUIRED=2.36.0
LIBSECRET_REQUIRED=0.5
MATEDESKTOP_REQUIRED=1.9.0
diff --git a/shell/ev-daemon.c b/shell/ev-daemon.c
index 9f41df5d..c242e550 100644
--- a/shell/ev-daemon.c
+++ b/shell/ev-daemon.c
@@ -521,11 +521,6 @@ 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 ffc8e327..c3288595 100644
--- a/thumbnailer/atril-thumbnailer.c
+++ b/thumbnailer/atril-thumbnailer.c
@@ -293,10 +293,6 @@ 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;