diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2013-01-07 20:19:49 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2013-01-07 21:06:51 -0500 |
| commit | 922c0d4ea0516419422b1d77b5b25176cc72f691 (patch) | |
| tree | afe1fae0073c21f2af8dc2e19c5d3904ba18a577 /pango/pangowin32-fontmap.c | |
| parent | 4dd5a5e18d4d3184ce4c97e0bcd9e97ebb267831 (diff) | |
| download | pango-922c0d4ea0516419422b1d77b5b25176cc72f691.tar.gz | |
Don't call g_type_init if GLib is new enough
g_type_init has been deprecated in GLib 2.35.x. Use a
version check here to avoid depending on unstable GLib.
Diffstat (limited to 'pango/pangowin32-fontmap.c')
| -rw-r--r-- | pango/pangowin32-fontmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index ec5b482f..5dc2a826 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -737,8 +737,10 @@ _pango_win32_font_map_class_init (PangoWin32FontMapClass *class) PangoFontMap * pango_win32_font_map_for_display (void) { +#if !GLIB_CHECK_VERSION (2, 35, 3) /* Make sure that the type system is initialized */ g_type_init (); +#endif if (g_once_init_enter ((gsize*)&default_fontmap)) g_once_init_leave((gsize*)&default_fontmap, (gsize)g_object_new (PANGO_TYPE_WIN32_FONT_MAP, NULL)); |