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/pangoxft-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/pangoxft-fontmap.c')
| -rw-r--r-- | pango/pangoxft-fontmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c index aa891c54..803dc186 100644 --- a/pango/pangoxft-fontmap.c +++ b/pango/pangoxft-fontmap.c @@ -222,8 +222,10 @@ pango_xft_get_font_map (Display *display, if (fontmap) return fontmap; +#if !GLIB_CHECK_VERSION (2, 35, 3) /* Make sure that the type system is initialized */ g_type_init (); +#endif xftfontmap = (PangoXftFontMap *)g_object_new (PANGO_TYPE_XFT_FONT_MAP, NULL); |