From f5023f704fb05b25d5fa6c78e0faefd93ef044ae Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Wed, 17 Jul 2013 12:42:40 +0100
Subject: Fix remaining g_type_init deprecation issues

(bzr r12421)
---
 src/main.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 4e2f2fd2b..d425b88bb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1283,12 +1283,15 @@ int sp_main_console(int argc, char const **argv)
 {
     /* We are started in text mode */
 
+#if !GLIB_CHECK_VERSION(2,36,0)
     /* Do this g_type_init(), so that we can use Xft/Freetype2 (Pango)
      * in a non-Gtk environment.  Used in libnrtype's
      * FontInstance.cpp and FontFactory.cpp.
      * http://mail.gnome.org/archives/gtk-list/2003-December/msg00063.html
      */
     g_type_init();
+#endif
+
     char **argv2 = const_cast<char **>(argv);
     gtk_init_check( &argc, &argv2 );
     //setlocale(LC_ALL, "");
-- 
cgit v1.2.3