From 6607a7fed10d0309957063cd97b389e0c4818d26 Mon Sep 17 00:00:00 2001
From: Monsta <monsta@inbox.ru>
Date: Mon, 12 Jan 2015 17:12:16 +0300
Subject: drop support for GLib < 2.36

Closes https://github.com/mate-desktop/mate-menus/pull/27
---
 configure.ac           |  2 +-
 libmenu/menu-monitor.c | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 27e8c13..ca3d6d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AM_PROG_LIBTOOL
 dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
 AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.36.0 gio-2.0 >= 2.15.2)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
diff --git a/libmenu/menu-monitor.c b/libmenu/menu-monitor.c
index f5b767c..48215c5 100644
--- a/libmenu/menu-monitor.c
+++ b/libmenu/menu-monitor.c
@@ -186,22 +186,9 @@ static gboolean monitor_callback (GFileMonitor* monitor, GFile* child, GFile* ot
 
 static MenuMonitor* register_monitor(const char* path, gboolean is_directory)
 {
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-  static gboolean  initted = FALSE;
-#endif
   MenuMonitor     *retval;
   GFile           *file;
 
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-  if (!initted)
-    {
-      /* This is the only place where we're using GObject and the app can't
-       * know we're using it, so we need to init the type system ourselves. */
-      g_type_init ();
-      initted = TRUE;
-    }
-#endif
-
   retval = g_new0 (MenuMonitor, 1);
 
   retval->path         = g_strdup (path);
-- 
cgit v1.2.1