[gmime] Don't call g_type_init() if glib >= 2.35.1



commit b9cdaceea7691dcecaaa00bc1607a6ef6cfaea23
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Sat Aug 10 08:30:59 2013 -0400

    Don't call g_type_init() if glib >= 2.35.1
    
    2013-08-10  Jeffrey Stedfast  <fejj gnome org>
    
        * gmime/gmime.c (g_mime_init): Don't call g_type_init() if glib >=
        2.35.1

 ChangeLog     |    5 +++++
 gmime/gmime.c |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f5cf460..3b5349d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-10  Jeffrey Stedfast  <fejj gnome org>
+
+       * gmime/gmime.c (g_mime_init): Don't call g_type_init() if glib >=
+       2.35.1
+
 2013-08-08  Jeffrey Stedfast  <fejj gnome org>
 
        * gmime/internet-address.c (decode_address): Properly deal with
diff --git a/gmime/gmime.c b/gmime/gmime.c
index cace297..89326a4 100644
--- a/gmime/gmime.c
+++ b/gmime/gmime.c
@@ -128,7 +128,9 @@ g_mime_init (guint32 flags)
        
        enable = flags;
        
+#if !GLIB_CHECK_VERSION(2, 35, 1)
        g_type_init ();
+#endif
        
        g_mime_charset_map_init ();
        g_mime_iconv_utils_init ();


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