diff options
author | LRN <lrn1986@gmail.com> | 2015-04-21 15:52:28 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2015-04-21 15:52:28 +0000 |
commit | df8acc0974e1345e4f0c04e8997001d980b68969 (patch) | |
tree | c6543f02d2cd61f0b8b92e5feb5ada45f6891555 /src | |
parent | e19ffccd5318595dc30262ecc88ab3bd90b30ad8 (diff) | |
download | libextractor-df8acc0974e1345e4f0c04e8997001d980b68969.tar.gz libextractor-df8acc0974e1345e4f0c04e8997001d980b68969.zip |
Don't use g_type_init() on newer glib versions
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/ole2_extractor.c | 4 | ||||
-rw-r--r-- | src/plugins/thumbnailgtk_extractor.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c index 3e97740..e007dd9 100644 --- a/src/plugins/ole2_extractor.c +++ b/src/plugins/ole2_extractor.c | |||
@@ -1007,7 +1007,9 @@ nolog (const gchar *log_domain, | |||
1007 | void __attribute__ ((constructor)) | 1007 | void __attribute__ ((constructor)) |
1008 | ole2_ltdl_init() | 1008 | ole2_ltdl_init() |
1009 | { | 1009 | { |
1010 | g_type_init(); | 1010 | #if !GLIB_CHECK_VERSION(2, 35, 0) |
1011 | g_type_init (); | ||
1012 | #endif | ||
1011 | #ifdef HAVE_GSF_INIT | 1013 | #ifdef HAVE_GSF_INIT |
1012 | gsf_init(); | 1014 | gsf_init(); |
1013 | #endif | 1015 | #endif |
diff --git a/src/plugins/thumbnailgtk_extractor.c b/src/plugins/thumbnailgtk_extractor.c index 23dd067..5b0db50 100644 --- a/src/plugins/thumbnailgtk_extractor.c +++ b/src/plugins/thumbnailgtk_extractor.c | |||
@@ -210,7 +210,9 @@ EXTRACTOR_thumbnail_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
210 | void __attribute__ ((constructor)) | 210 | void __attribute__ ((constructor)) |
211 | thumbnailgtk_gobject_init () | 211 | thumbnailgtk_gobject_init () |
212 | { | 212 | { |
213 | #if !GLIB_CHECK_VERSION(2, 35, 0) | ||
213 | g_type_init (); | 214 | g_type_init (); |
215 | #endif | ||
214 | magic = magic_open (MAGIC_MIME_TYPE); | 216 | magic = magic_open (MAGIC_MIME_TYPE); |
215 | if (0 != magic_load (magic, NULL)) | 217 | if (0 != magic_load (magic, NULL)) |
216 | { | 218 | { |