[evolution] Bug #667346 - Fix build with libpst 0.6.54 and require this version
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug #667346 - Fix build with libpst 0.6.54 and require this version
- Date: Mon, 9 Jan 2012 17:18:42 +0000 (UTC)
commit f15c6e4e8fcfce0b5d12871db6a48840dc34c38b
Author: Vincent Untz <vuntz gnome org>
Date: Mon Jan 9 18:17:54 2012 +0100
Bug #667346 - Fix build with libpst 0.6.54 and require this version
configure.ac | 4 ++--
plugins/pst-import/pst-importer.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ce88950..b34ec77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ m4_define([libgdata_minimum_version], [0.10])
m4_define([libsoup_minimum_version], [2.31.2])
m4_define([libxml_minimum_version], [2.7.3])
m4_define([shared_mime_info_minimum_version], [0.22])
-m4_define([libpst_minimum_version], [0.6.41])
+m4_define([libpst_minimum_version], [0.6.54])
m4_define([libnotify_minimum_version], [0.5.1])
dnl Optional Packages
@@ -1479,7 +1479,7 @@ AC_ARG_ENABLE([pst-import],
[enable_pst="$enableval"], [enable_pst=yes])
if test "x$enable_pst" = "xyes"; then
- PKG_CHECK_MODULES(LIBPST, libpst, have_pst=yes, have_pst=no)
+ PKG_CHECK_MODULES(LIBPST, libpst >= libpst_minimum_version, have_pst=yes, have_pst=no)
AC_SUBST(LIBPST_CFLAGS)
AC_SUBST(LIBPST_LIBS)
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 5b99053..4305827 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -2219,7 +2219,7 @@ pst_init (pst_file *pst,
DEBUG_REGISTER_CLOSE ();
#endif
- if (pst_open (pst, filename) < 0) {
+ if (pst_open (pst, filename, NULL) < 0) {
pst_error_msg ("Error opening PST file %s", filename);
return -1;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]