isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

core: Don't initialize the GType system with --disable-glib

Browse Source 
--disable-glib also defines COGL_HAS_GTYPE_SUPPORT to #ifdef out GType
support in cogl. This also means we don't want to initialize glib's type
system in that case.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 67ad777099d62bdbc8515f6ee58ed80429cc6496)
This commit is contained in:
Damien Lespiau 2012-09-15 14:39:29 +01:00 committed by Robert Bragg
parent 27fb294887
commit eb92b512c6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl.c
View File

@ -800,7 +800,9 @@ _cogl_init (void)
bindtextdomain (GETTEXT_PACKAGE, COGL_LOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, COGL_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#ifdef COGL_HAS_GTYPE_SUPPORT
g_type_init (); g_type_init ();
#endif
_cogl_config_read (); _cogl_config_read ();
_cogl_debug_check_environment (); _cogl_debug_check_environment ();