From 71006c534a5599f0a69f4bd9b6677b2a6ad5adb3 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 15 Mar 2013 06:03:52 -0400 Subject: Call g_type_init if necessary --- pango/pangocairo-fontmap.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index 8f3cc532..a1431902 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -66,6 +66,10 @@ pango_cairo_font_map_default_init (PangoCairoFontMapIface *iface) PangoFontMap * pango_cairo_font_map_new (void) { +#if !GLIB_CHECK_VERSION (2, 35, 3) + /* Make sure that the type system is initialized */ + g_type_init (); +#endif #if defined(HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ) return g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP, NULL); #elif defined(HAVE_CAIRO_WIN32) @@ -99,6 +103,10 @@ pango_cairo_font_map_new (void) PangoFontMap * pango_cairo_font_map_new_for_font_type (cairo_font_type_t fonttype) { +#if !GLIB_CHECK_VERSION (2, 35, 3) + /* Make sure that the type system is initialized */ + g_type_init (); +#endif switch ((int) fonttype) { #if defined(HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ) -- cgit v1.2.1