summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-01-13 17:24:09 +0300
committerStefano Karapetsas <[email protected]>2015-01-14 07:48:27 +0100
commit1abdbdff876def3f061592d0f2317fcefc4d03cb (patch)
tree2ce3186d8437854c64791f7c858a398a655cad1a
parentb1e79889bcb1735c079ff563ab4960fe92338538 (diff)
downloadmate-netbook-1abdbdff876def3f061592d0f2317fcefc4d03cb.tar.bz2
mate-netbook-1abdbdff876def3f061592d0f2317fcefc4d03cb.tar.xz
require GLib >= 2.36
Closes https://github.com/mate-desktop/mate-netbook/pull/16
-rw-r--r--configure.ac4
-rw-r--r--maximus/main.c6
2 files changed, 3 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 301f70c..7906045 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ AM_GLIB_GNU_GETTEXT
AC_SUBST(GCC_FLAGS)
+GLIB_REQUIRED=2.36.0
AC_MSG_CHECKING([which gtk+ version to compile against])
AC_ARG_WITH([gtk],
@@ -55,6 +56,7 @@ esac
PKG_CHECK_MODULES(MAXIMUS_DEPS,
gtk+-$GTK_API_VERSION
+ glib-2.0 >= $GLIB_REQUIRED
gio-2.0
libwnck-$LIBWNCK_API_VERSION
xtst
@@ -67,7 +69,7 @@ AC_SUBST(MAXIMUS_DEPS_LIBS)
PKG_CHECK_MODULES(MATEWINDOWPICKER_DEPS,
libmatepanelapplet-4.0
gtk+-$GTK_API_VERSION
- glib-2.0
+ glib-2.0 >= $GLIB_REQUIRED
gio-2.0
libwnck-$LIBWNCK_API_VERSION
mate-desktop-2.0 >= 1.9.0
diff --git a/maximus/main.c b/maximus/main.c
index 8083f48..bfbc284 100644
--- a/maximus/main.c
+++ b/maximus/main.c
@@ -64,12 +64,6 @@ gint main (gint argc, gchar *argv[])
MaximusApp UNUSED_VARIABLE *app;
GOptionContext *context;
-#if GLIB_CHECK_VERSION (2, 32, 0)
- /* g_thread_init (NULL); */
-#else
- g_thread_init (NULL);
-#endif
-
g_set_application_name ("Maximus");
gtk_init (&argc, &argv);