[GNUnet-SVN] r35550 - in Extractor: . src/plugins

[gnunet]

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

Modified:
   Extractor/configure.ac
   Extractor/src/plugins/ole2_extractor.c
Log:
Make ole2 extractor compatible with newer libgsf

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2015-04-21 15:52:22 UTC (rev 35549)
+++ Extractor/configure.ac      2015-04-21 15:52:25 UTC (rev 35550)
@@ -638,6 +638,7 @@
 # produce new line
 echo ""
 AC_CHECK_LIB(gsf-1, gsf_init, AC_DEFINE(HAVE_GSF_INIT,1,[gsf_init supported]))
+AC_CHECK_LIB(gsf-1, gsf_doc_meta_data_read_from_msole, 
AC_DEFINE(HAVE_GSF_DOC_META_DATA_READ_FROM_MSOLE,1,[gsf_doc_meta_data_read_from_msole
 supported]))
 
 AC_CHECK_PROG([HAVE_ZZUF],[zzuf], 1, 0)
 AM_CONDITIONAL(HAVE_ZZUF, test 0 != $HAVE_ZZUF)

Modified: Extractor/src/plugins/ole2_extractor.c
===================================================================
--- Extractor/src/plugins/ole2_extractor.c      2015-04-21 15:52:22 UTC (rev 
35549)
+++ Extractor/src/plugins/ole2_extractor.c      2015-04-21 15:52:25 UTC (rev 
35550)
@@ -283,17 +283,27 @@
 {
   struct ProcContext pc;
   GsfDocMetaData *sections;
+  GError *error;
 
   pc.proc = proc;
   pc.proc_cls = proc_cls;
   pc.ret = 0;
   sections = gsf_doc_meta_data_new ();
-  if (NULL == gsf_msole_metadata_read (in, sections))
+#ifdef HAVE_GSF_DOC_META_DATA_READ_FROM_MSOLE
+  error = gsf_doc_meta_data_read_from_msole (sections, in);
+#else
+  error = gsf_msole_metadata_read (in, sections);
+#endif
+  if (NULL == error)
     {
       gsf_doc_meta_data_foreach (sections,
                                 &process_metadata,
                                 &pc);
     }
+  else
+    {
+      g_error_free (error);
+    }
   g_object_unref (G_OBJECT (sections));
   return pc.ret;
 }