mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/libs/Makefile.am
View file

@ -37,7 +37,7 @@ HFILE_GLOB=$(top_srcdir)/libs/gst/*/*.h
CFILE_GLOB=$(top_srcdir)/libs/gst/*/*.c CFILE_GLOB=$(top_srcdir)/libs/gst/*/*.c
# Extra options to pass to gtkdoc-scanobj or gtkdoc-scangobj. # 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. # Header files to ignore when scanning.
IGNORE_HFILES = \ IGNORE_HFILES = \

3
gst/gst.c
View file

@ -545,8 +545,9 @@ init_pre (GOptionContext * context, GOptionGroup * group, gpointer data,
GST_DEBUG ("already initialized"); GST_DEBUG ("already initialized");
return TRUE; return TRUE;
} }
#if !GLIB_CHECK_VERSION(2, 35, 0)
g_type_init (); g_type_init ();
#endif
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
_priv_gst_debug_init (); _priv_gst_debug_init ();