Remove calls to g_type_init()

g_type_init() has been deprecated since 2.36.

diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c
index 2cc1e91..97f9169 100644 (file)
--- a/atspi/atspi-misc.c
+++ b/atspi/atspi-misc.c
@@ -860,8 +860,6 @@ atspi_init (void)
 
   atspi_inited = TRUE;
 
-  g_type_init ();
-
   _atspi_get_live_refs();
 
   bus = atspi_get_a11y_bus ();

diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
index f7832dd..63b5b28 100644 (file)
--- a/bus/at-spi-bus-launcher.c
+++ b/bus/at-spi-bus-launcher.c
@@ -580,8 +580,6 @@ main (int    argc,
   gboolean screen_reader_set = FALSE;
   gint i;
 
-  g_type_init ();
-
   if (already_running ())
     return 0;
 

diff --git a/configure.ac b/configure.ac
index aaf52d2..f606d1a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0])
 AC_SUBST(DBUS_LIBS)
 AC_SUBST(DBUS_CFLAGS)
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.26.0])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.36.0])
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 AC_CHECK_LIB([glib-2.0], [g_ptr_array_new_with_free_func], [:],

diff --git a/registryd/registry-main.c b/registryd/registry-main.c
index b088b1a..8c3f54a 100644 (file)
--- a/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@ -199,8 +199,6 @@ main (int argc, char **argv)
   GError *err = NULL;
   int ret;
 
-  g_type_init();
-
   /*Parse command options*/
   opt = g_option_context_new(NULL);
   g_option_context_add_main_entries(opt, optentries, NULL);