From bf2452d776899a197239cb6e10882f2978b9ae0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Sat, 20 Oct 2012 12:54:06 +0100
Subject: [PATCH] g_type_init() is no longer required and deprecated in glib >=
 2.35.0

https://bugzilla.gnome.org/show_bug.cgi?id=686456
---
 docs/libs/Makefile.am | 2 +-
 gst/gst.c             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 60d7318a45..4c621b531d 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -37,7 +37,7 @@ HFILE_GLOB=$(top_srcdir)/libs/gst/*/*.h
 CFILE_GLOB=$(top_srcdir)/libs/gst/*/*.c
 
 # Extra options to pass to gtkdoc-scanobj or gtkdoc-scangobj.
-SCANOBJ_OPTIONS=--type-init-func="g_type_init();gst_init(&argc,&argv)"
+SCANOBJ_OPTIONS=--type-init-func="gst_init(&argc,&argv)"
 
 # Header files to ignore when scanning.
 IGNORE_HFILES = \
diff --git a/gst/gst.c b/gst/gst.c
index 1be9773f0d..c58e10166e 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -545,8 +545,9 @@ init_pre (GOptionContext * context, GOptionGroup * group, gpointer data,
     GST_DEBUG ("already initialized");
     return TRUE;
   }
-
+#if !GLIB_CHECK_VERSION(2, 35, 0)
   g_type_init ();
+#endif
 
 #ifndef GST_DISABLE_GST_DEBUG
   _priv_gst_debug_init ();