# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1087944130 0
# Node ID a5ec9e73f46db9ddfb8b3ebad77ef41a12d4bb95
# Parent  b8138f3959dcd30738451901d785e0e4370010d7
[gaim-migrate @ 10162]
Because the Evolution project doesn't bump their version numbers until just
before release, and they broke backwards-compatibility since the last
evolution-data-server release in the header files, those people using
0.0.95cvs are going to not be able to compile gevolution until 0.0.95 comes
out, or unless they comment out the #include <libebook/e-book-async.h> in
gevolution.h. The code I added here centralizes the include files a bit
more, and checks if we're using 0.0.95 or not. The Evo guys are releasing
hopefully next week or the week after, I think, so that should take care of
it.

committer: Tailor Script <tailor@pidgin.im>

diff -r b8138f3959dc -r a5ec9e73f46d plugins/gevolution/add_buddy_dialog.c
--- a/plugins/gevolution/add_buddy_dialog.c	Tue Jun 22 21:12:31 2004 +0000
+++ b/plugins/gevolution/add_buddy_dialog.c	Tue Jun 22 22:42:10 2004 +0000
@@ -28,9 +28,6 @@
 
 #include <stdlib.h>
 #include <bonobo/bonobo-main.h>
-#include <libebook/e-book.h>
-#include <libebook/e-book-async.h>
-#include <libedataserver/e-source-list.h>
 
 enum
 {
diff -r b8138f3959dc -r a5ec9e73f46d plugins/gevolution/assoc-buddy.c
--- a/plugins/gevolution/assoc-buddy.c	Tue Jun 22 21:12:31 2004 +0000
+++ b/plugins/gevolution/assoc-buddy.c	Tue Jun 22 22:42:10 2004 +0000
@@ -30,9 +30,6 @@
 
 #include <stdlib.h>
 #include <bonobo/bonobo-main.h>
-#include <libebook/e-book.h>
-#include <libebook/e-book-async.h>
-#include <libedataserver/e-source-list.h>
 
 enum
 {
diff -r b8138f3959dc -r a5ec9e73f46d plugins/gevolution/gevo-util.c
--- a/plugins/gevolution/gevo-util.c	Tue Jun 22 21:12:31 2004 +0000
+++ b/plugins/gevolution/gevo-util.c	Tue Jun 22 22:42:10 2004 +0000
@@ -22,8 +22,6 @@
 #include "gtkblist.h"
 #include "gtkutils.h"
 
-#include <libebook/e-book.h>
-
 #include "gevolution.h"
 
 void
diff -r b8138f3959dc -r a5ec9e73f46d plugins/gevolution/gevolution.c
--- a/plugins/gevolution/gevolution.c	Tue Jun 22 21:12:31 2004 +0000
+++ b/plugins/gevolution/gevolution.c	Tue Jun 22 22:42:10 2004 +0000
@@ -36,7 +36,6 @@
 #include <libedata-book/Evolution-DataServer-Addressbook.h>
 
 #include <libebook/e-book-listener.h>
-#include <libebook/e-book-async.h>
 #include <libedata-book/e-data-book-factory.h>
 #include <bonobo/bonobo-main.h>
 
diff -r b8138f3959dc -r a5ec9e73f46d plugins/gevolution/gevolution.h
--- a/plugins/gevolution/gevolution.h	Tue Jun 22 21:12:31 2004 +0000
+++ b/plugins/gevolution/gevolution.h	Tue Jun 22 22:42:10 2004 +0000
@@ -25,8 +25,18 @@
 # 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>
 
+#if !EBOOK_CHECK_VERSION(0, 0, 95)
+# include <libebook/e-book-async.h>
+#endif
+
 typedef struct
 {
 	GaimAccount *account;
@@ -87,12 +97,6 @@
 
 } GevoAssociateBuddyDialog;
 
-#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)))
-
 void gevo_add_buddy_dialog_show(GaimAccount *account, const char *username,
 								const char *group, const char *alias);
 void gevo_add_buddy_dialog_add_person(GevoAddBuddyDialog *dialog,
diff -r b8138f3959dc -r a5ec9e73f46d plugins/gevolution/new_person_dialog.c
--- a/plugins/gevolution/new_person_dialog.c	Tue Jun 22 21:12:31 2004 +0000
+++ b/plugins/gevolution/new_person_dialog.c	Tue Jun 22 22:42:10 2004 +0000
@@ -25,9 +25,6 @@
 
 #include "gevolution.h"
 
-#include <libebook/e-book-async.h>
-#include <libedataserver/e-source-list.h>
-
 static GtkWidget *
 add_pref_box(GtkSizeGroup *sg, GtkWidget *parent, const char *text,
 			 GtkWidget *widget)