# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1113752188 0
# Node ID c5f8b6e66455d1b3928b32bd6aefaa34f64d0283
# Parent  76d85ccf7d9072ae80da604183a9f6186ba5f1c1
[gaim-migrate @ 12507]
the gevolution plugin works with evolution-data-server 1.0 or 1.2

committer: Tailor Script <tailor@pidgin.im>

diff -r 76d85ccf7d90 -r c5f8b6e66455 configure.ac
--- a/configure.ac	Sun Apr 17 15:33:37 2005 +0000
+++ b/configure.ac	Sun Apr 17 15:36:28 2005 +0000
@@ -330,26 +330,21 @@
 AC_ARG_ENABLE(gevolution, [  --disable-gevolution    compile without the Gaim-Evolution plugin],,enable_gevolution=yes)
 
 if test "x$enable_gevolution" = "xyes"; then
-	evo_deps="libxml-2.0 libebook-1.0 libedata-book-1.0"
-	PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, build_gevo=yes, build_gevo=no)
+	evo_deps="libxml-2.0 libebook-1.2 libedata-book-1.2"
+	PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [
+		AC_DEFINE(HAVE_EVOLUTION_ADDRESSBOOK, 1, [Define if we're using evolution addressbook.])
+		build_gevo=yes
+	], build_gevo=no)
+	if test "x$build_gevo" = "xno"; then
+		evo_deps="libxml-2.0 libebook-1.0 libedata-book-1.0"
+		PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [
+			AC_DEFINE(HAVE_EVOLUTION_ADDRESSBOOK, 1, [Define if we're using evolution addressbook.])
+			build_gevo=yes
+		], build_gevo=no)
+	fi
 
 	AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
 	AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
-
-	dnl This can be removed in a few releases of Evolution, especially when
-	dnl it goes stable!
-	AC_MSG_CHECKING([libebook version])
-	LIBEBOOK_VERSION=`$PKG_CONFIG --modversion libebook-1.0`
-	LIBEBOOK_MAJOR_VER=`echo $LIBEBOOK_VERSION | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-	LIBEBOOK_MINOR_VER=`echo $LIBEBOOK_VERSION | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-	LIBEBOOK_MICRO_VER=`echo $LIBEBOOK_VERSION | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-	AC_MSG_RESULT($LIBEBOOK_VERSION)
-
-	if test "x$LIBEBOOK_MAJOR_VER" != "x" -a "x$LIBEBOOK_MINOR_VER" != "x" -a "x$LIBEBOOK_MICRO_VER" != "x"; then
-		AC_DEFINE_UNQUOTED(LIBEBOOK_MAJOR_VER, $LIBEBOOK_MAJOR_VER, [libebook major version.])
-		AC_DEFINE_UNQUOTED(LIBEBOOK_MINOR_VER, $LIBEBOOK_MINOR_VER, [libebook minor version.])
-		AC_DEFINE_UNQUOTED(LIBEBOOK_MICRO_VER, $LIBEBOOK_MICRO_VER, [libebook micro version.])
-	fi
 fi
 
 AM_CONDITIONAL(BUILD_GEVOLUTION, test "x$build_gevo" = "xyes")
diff -r 76d85ccf7d90 -r c5f8b6e66455 plugins/gevolution/gevolution.h
--- a/plugins/gevolution/gevolution.h	Sun Apr 17 15:33:37 2005 +0000
+++ b/plugins/gevolution/gevolution.h	Sun Apr 17 15:36:28 2005 +0000
@@ -25,12 +25,6 @@
 # include "config.h"
 #endif
 
-#define EBOOK_CHECK_VERSION(major, minor, micro) \
-	(LIBEBOOK_MAJOR_VER > (major) || \
-	 (LIBEBOOK_MAJOR_VER == (major) && LIBEBOOK_MINOR_VER > (minor)) || \
-	 (LIBEBOOK_MAJOR_VER == (major) && LIBEBOOK_MINOR_VER == (minor) && \
-	  LIBEBOOK_MICRO_VER >= (micro)))
-
 #include <libebook/e-book.h>
 
 enum
diff -r 76d85ccf7d90 -r c5f8b6e66455 src/gtkdialogs.c
--- a/src/gtkdialogs.c	Sun Apr 17 15:33:37 2005 +0000
+++ b/src/gtkdialogs.c	Sun Apr 17 15:36:28 2005 +0000
@@ -361,10 +361,10 @@
 
 g_string_append(str, "<br/>  <b>Library Support</b><br/>");
 
-#if defined(LIBEBOOK_MAJOR_VER) && defined(LIBEBOOK_MINOR_VER) && defined(LIBEBOOK_MICRO_VER)
-	g_string_append_printf(str, "    <b>Evolution:</b> Enabled (Version %i.%i.%i)<br/>", LIBEBOOK_MAJOR_VER, LIBEBOOK_MINOR_VER, LIBEBOOK_MICRO_VER);
+#ifdef HAVE_EVOLUTION_ADDRESSBOOK
+	g_string_append_printf(str, "    <b>Evolution Addressbook:</b> Enabled<br/>");
 #else
-	g_string_append_printf(str, "    <b>Evolution:</b> Disabled<br/>");
+	g_string_append_printf(str, "    <b>Evolution Addressbook:</b> Disabled<br/>");
 #endif
 
 #ifdef USE_GTKSPELL