From 1735f28f5aa0d8626aed4361c08cda4ab889cf0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 17 Oct 2012 15:25:18 +0200
Subject: [PATCH] Remove use of deprecated g_type_init () ...

... and bump GObject requirement accordingly.

https://bugzilla.gnome.org/show_bug.cgi?id=686318
---
 browser-plugin/browser-plugin.c       | 2 --
 configure.ac                          | 2 +-
 src/hotplug-sniffer/hotplug-sniffer.c | 2 --
 src/main.c                            | 2 --
 src/run-js-test.c                     | 1 -
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/browser-plugin/browser-plugin.c b/browser-plugin/browser-plugin.c
index b47b41c0e..967778948 100644
--- a/browser-plugin/browser-plugin.c
+++ b/browser-plugin/browser-plugin.c
@@ -153,8 +153,6 @@ NP_Initialize(NPNetscapeFuncs *pfuncs, NPPluginFuncs *plugin)
   /* global initialization routine, called once when plugin
      is loaded */
 
-  g_type_init ();
-
   g_debug ("plugin loaded");
 
   memcpy (&funcs, pfuncs, sizeof (funcs));
diff --git a/configure.ac b/configure.ac
index 41bbd67f2..73ce9f529 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.33.2
 MUTTER_MIN_VERSION=3.6.1
 GTK_MIN_VERSION=3.3.9
-GIO_MIN_VERSION=2.31.6
+GIO_MIN_VERSION=2.35.0
 LIBECAL_MIN_VERSION=3.5.3
 LIBEDATASERVER_MIN_VERSION=3.5.3
 LIBEDATASERVERUI_MIN_VERSION=3.5.3
diff --git a/src/hotplug-sniffer/hotplug-sniffer.c b/src/hotplug-sniffer/hotplug-sniffer.c
index 31b743d90..af3a4c2fc 100644
--- a/src/hotplug-sniffer/hotplug-sniffer.c
+++ b/src/hotplug-sniffer/hotplug-sniffer.c
@@ -240,8 +240,6 @@ main (int    argc,
 {
   guint name_owner_id;
 
-  g_type_init ();
-
   introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
   g_assert (introspection_data != NULL);
 
diff --git a/src/main.c b/src/main.c
index 001a91a57..a0cf0dca1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -361,8 +361,6 @@ main (int argc, char **argv)
   int ecode;
   TpDebugSender *sender;
 
-  g_type_init ();
-
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
diff --git a/src/run-js-test.c b/src/run-js-test.c
index 894e2b67a..84c1d26d2 100644
--- a/src/run-js-test.c
+++ b/src/run-js-test.c
@@ -92,7 +92,6 @@ main(int argc, char **argv)
     g_error ("option parsing failed: %s", error->message);
 
   setlocale (LC_ALL, "");
-  g_type_init ();
 
   _shell_global_init (NULL);
   global = shell_global_get ();