# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1087938273 0
# Node ID cc2baf3498055750f25b47841278bf3e9605b3ef
# Parent  e537f33dc06444ccc4886070ee5a27505a5113f7
[gaim-migrate @ 10160]
Remove the hack that was needed before evolution-data-server 0.0.94's
release to maintain compatibility with release and CVS.

committer: Tailor Script <tailor@pidgin.im>

diff -r e537f33dc064 -r cc2baf349805 configure.ac
--- a/configure.ac	Tue Jun 22 19:09:24 2004 +0000
+++ b/configure.ac	Tue Jun 22 21:04:33 2004 +0000
@@ -312,15 +312,6 @@
 	AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
 	AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
 
-	dnl This is necessary, because Evolution bumps the version just before
-	dnl release, and they broke the API in the current evolution-data-server
-	dnl release (0.0.93). Version checks won't work until 0.0.94, so we'll
-	dnl do this for now. Remove in a couple versions!
-	AC_CHECK_LIB(ebook, e_book_new_system_addressbook,
-	[
-		AC_DEFINE(LIBEBOOK_NEW_API, 1, [new API in libebook 0.0.94cvs])
-	], , $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])
diff -r e537f33dc064 -r cc2baf349805 plugins/gevolution/gevo-util.c
--- a/plugins/gevolution/gevo-util.c	Tue Jun 22 19:09:24 2004 +0000
+++ b/plugins/gevolution/gevo-util.c	Tue Jun 22 21:04:33 2004 +0000
@@ -133,12 +133,10 @@
 
 	g_return_val_if_fail(book != NULL, FALSE);
 
-/* #if EBOOK_CHECK_VERSION(0, 0, 94) */
-#ifdef LIBEBOOK_NEW_API
+#if EBOOK_CHECK_VERSION(0, 0, 94)
 	*book = e_book_new_system_addressbook(NULL);
 
-	if (book != NULL)
-		result = e_book_open(*book, FALSE, NULL);
+	result = e_book_open(*book, FALSE, NULL);
 #else
 	*book = e_book_new();