libextractor

commit df8acc0974e1345e4f0c04e8997001d980b68969
parent e19ffccd5318595dc30262ecc88ab3bd90b30ad8
Author: LRN <lrn1986@gmail.com>
Date:   Tue, 21 Apr 2015 15:52:28 +0000

Don't use g_type_init() on newer glib versions

Diffstat:
M
src/plugins/ole2_extractor.c
 | 
4
+++-
M
src/plugins/thumbnailgtk_extractor.c
 | 
2
++

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c
@@ -1007,7 +1007,9 @@ nolog (const gchar *log_domain,
 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
diff --git a/src/plugins/thumbnailgtk_extractor.c b/src/plugins/thumbnailgtk_extractor.c
@@ -210,7 +210,9 @@ EXTRACTOR_thumbnail_extract_method (struct EXTRACTOR_ExtractContext *ec)
 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))
     {