Drop obsolete g_type_init()

Bump glib dependency to >= 2.36.

6 files changed, 2 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index c5358ea..0e0c008 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,11 +122,11 @@ PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 165])
 AC_SUBST(GUDEV_CFLAGS)
 AC_SUBST(GUDEV_LIBS)
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.31.13])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.36])
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-PKG_CHECK_MODULES(GIO, [gio-unix-2.0 >= 2.31.13])
+PKG_CHECK_MODULES(GIO, [gio-unix-2.0 >= 2.36])
 AC_SUBST(GIO_CFLAGS)
 AC_SUBST(GIO_LIBS)
 
diff --git a/src/main.c b/src/main.c
index 6bec07d..6f8a109 100644
--- a/src/main.c
+++ b/src/main.c
@@ -101,8 +101,6 @@ main (int    argc,
   name_owner_id = 0;
   sigint_id = 0;
 
-  g_type_init ();
-
   /* avoid gvfs (http://bugzilla.gnome.org/show_bug.cgi?id=526454) */
   if (!g_setenv ("GIO_USE_VFS", "local", TRUE))
     {
diff --git a/src/tests/helper.c b/src/tests/helper.c
index 388494d..087ba30 100644
--- a/src/tests/helper.c
+++ b/src/tests/helper.c
@@ -32,8 +32,6 @@ main (int argc, char *argv[])
 {
   gint ret;
 
-  g_type_init ();
-
   ret = 1;
 
   g_assert_cmpint (argc, ==, 2);
diff --git a/src/tests/test.c b/src/tests/test.c
index f828ffa..a1443e4 100644
--- a/src/tests/test.c
+++ b/src/tests/test.c
@@ -534,7 +534,6 @@ main (int    argc,
 {
   int ret;
 
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   loop = g_main_loop_new (NULL, FALSE);
diff --git a/tools/udisksctl.c b/tools/udisksctl.c
index c87fe9f..f10c828 100644
--- a/tools/udisksctl.c
+++ b/tools/udisksctl.c
@@ -3201,7 +3201,6 @@ main (int argc,
   completion_prev = NULL;
   loop = NULL;
 
-  g_type_init ();
   _color_init ();
 
   setlocale (LC_ALL, "");
diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c
index 0987156..bd68192 100644
--- a/tools/umount-udisks.c
+++ b/tools/umount-udisks.c
@@ -80,8 +80,6 @@ main (int argc, char *argv[])
   client = NULL;
   object = NULL;
 
-  g_type_init ();
-
   if (argc < 2 || strlen (argv[1]) == 0)
     {
       g_printerr ("%s: this program is only supposed to be invoked by umount(8).\n", argv[0]);