From f527ffa8959d5ec28f8338008464c21e7d9777fa Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Mon, 30 Jul 2012 11:03:24 -0400 Subject: [PATCH] * #13994: addressbook: use single-file includes if eds version >= 3.5.3 --- plugins/addressbook/evolution/eds.c | 8 ++++++-- plugins/addressbook/evolution/eds.h | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/plugins/addressbook/evolution/eds.c b/plugins/addressbook/evolution/eds.c index a36efcbcdb..508fc238ef 100644 --- a/plugins/addressbook/evolution/eds.c +++ b/plugins/addressbook/evolution/eds.c @@ -36,13 +36,17 @@ * as that of the covered work. */ +#include "config.h" + #include <glib.h> #include <string.h> #include <pango/pango.h> #include "eds.h" +#if EDS_CHECK_VERSION(3,5,3) +#include <libedataserver/libedataserver.h> +#else #include <libedataserver/e-source.h> - -#include "config.h" +#endif /** * Structure used to store search callback and data diff --git a/plugins/addressbook/evolution/eds.h b/plugins/addressbook/evolution/eds.h index 5bbf71e1af..a905dd20f9 100644 --- a/plugins/addressbook/evolution/eds.h +++ b/plugins/addressbook/evolution/eds.h @@ -40,7 +40,14 @@ #include <glib.h> #include <gdk-pixbuf/gdk-pixbuf.h> + +#include <libedataserver/eds-version.h> + +#if EDS_CHECK_VERSION(3,5,3) +#include <libebook/libebook.h> +#else #include <libebook/e-book.h> +#endif #include "addressbook.h" -- GitLab