[GNUnet-SVN] r35551 - Extractor/src/plugins

[gnunet]

Author: LRN
Date: 2015-04-21 17:52:28 +0200 (Tue, 21 Apr 2015)
New Revision: 35551

Modified:
   Extractor/src/plugins/ole2_extractor.c
   Extractor/src/plugins/thumbnailgtk_extractor.c
Log:
Don't use g_type_init() on newer glib versions

Modified: Extractor/src/plugins/ole2_extractor.c
===================================================================
--- Extractor/src/plugins/ole2_extractor.c      2015-04-21 15:52:25 UTC (rev 
35550)
+++ Extractor/src/plugins/ole2_extractor.c      2015-04-21 15:52:28 UTC (rev 
35551)
@@ -1007,7 +1007,9 @@
 void __attribute__ ((constructor)) 
 ole2_ltdl_init() 
 {
-  g_type_init();
+#if !GLIB_CHECK_VERSION(2, 35, 0)
+  g_type_init ();
+#endif
 #ifdef HAVE_GSF_INIT
   gsf_init();
 #endif

Modified: Extractor/src/plugins/thumbnailgtk_extractor.c
===================================================================
--- Extractor/src/plugins/thumbnailgtk_extractor.c      2015-04-21 15:52:25 UTC 
(rev 35550)
+++ Extractor/src/plugins/thumbnailgtk_extractor.c      2015-04-21 15:52:28 UTC 
(rev 35551)
@@ -210,7 +210,9 @@
 void __attribute__ ((constructor)) 
 thumbnailgtk_gobject_init ()
 {
+#if !GLIB_CHECK_VERSION(2, 35, 0)
   g_type_init ();
+#endif
   magic = magic_open (MAGIC_MIME_TYPE);
   if (0 != magic_load (magic, NULL))
     {