[gnumeric] glib: don't call g_type_init if glib is new.



commit ba323655bbe41a16ed9839e0ca6c81cb3d998de7
Author: Morten Welinder <terra gnome org>
Date:   Sat Oct 19 13:22:24 2013 -0400

    glib: don't call g_type_init if glib is new.

 src/libgnumeric.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index c771998..40e952e 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -189,7 +189,9 @@ gnm_pre_parse_init (int argc, gchar const **argv)
 #if !GLIB_CHECK_VERSION(2,32,0)
        g_thread_init (NULL);
 #endif
+#if !GLIB_CHECK_VERSION(2,36,0)
        g_type_init ();
+#endif
 
        /* On win32 argv contains 'ansi' encoded args.  We need to manually
         * pull in the real versions and convert them to utf-8 */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]