summaryrefslogtreecommitdiff
path: root/pango/modules.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2013-01-07 20:19:49 -0500
committerMatthias Clasen <mclasen@redhat.com>2013-01-07 21:06:51 -0500
commit922c0d4ea0516419422b1d77b5b25176cc72f691 (patch)
treeafe1fae0073c21f2af8dc2e19c5d3904ba18a577 /pango/modules.c
parent4dd5a5e18d4d3184ce4c97e0bcd9e97ebb267831 (diff)
downloadpango-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/modules.c')
-rw-r--r--pango/modules.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/pango/modules.c b/pango/modules.c
index 24cdbf7d..ca8d4885 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -602,8 +602,10 @@ init_modules (void)
if (g_once_init_enter (&init))
{
+#if !GLIB_CHECK_VERSION (2, 35, 3)
/* Make sure that the type system is initialized */
g_type_init ();
+#endif
for (i = 0; _pango_included_lang_modules[i].list; i++)
pango_module_register (&_pango_included_lang_modules[i]);