g_type_init() is no longer required and deprecated in glib >= 2.35.0

https://bugzilla.gnome.org/show_bug.cgi?id=686456
This commit is contained in:
Tim-Philipp Müller 2012-10-20 12:54:06 +01:00
parent 017b34079e
commit bf2452d776
2 changed files with 3 additions and 2 deletions

View file

@ -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 = \

View file

@ -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 ();