[tracker/tracker-0.14] evolution: Fixed includes ... yet again

[Martyn James Russell <mr src gnome org>]

commit 40e455ed01cbe45b92692e319dd39e9c433e1d82
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Apr 2 18:25:16 2012 +0100

    evolution: Fixed includes ... yet again
    
    So I have this time put each include in separate sections. The logic was
    getting too complicated and it was hard to maintain. This is why single
    include files make so much sense.
    
    I've checked each release of the libraries we import from and the files do
    exist for each of the versions we support.
    
    I removed the camel include because all the Evolution includes include that
    already.
    
    I also removed the include for older than 2.91 versions which didn't exist
    there and was reported under the bug below.
    
    Fixes GB#672415

 src/plugins/evolution/tracker-evolution-plugin.c |   39 ++++++++++++----------
 1 files changed, 21 insertions(+), 18 deletions(-)
---
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index 4c4692f..9e31753 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -41,41 +41,44 @@
 
 #include <sqlite3.h>
 
-#include <libedataserver/eds-version.h>
-
-#include <camel/camel.h>
-
-#ifdef EVOLUTION_SHELL_3_2
-#include <mail/em-utils.h>
-#include <mail/e-mail.h>
-#endif  /* EVOLUTION_SHELL_3_2 */
-
-#ifdef EVOLUTION_SHELL_3_3_5
+/* This is why you should seal your headers with one include for
+ * client sanity. This is the horendous shit we've had to put up with
+ * for years from the Evo shell API :(
+ */
+#if defined(EVOLUTION_SHELL_3_3_5)
 #include <libemail-engine/e-mail-folder-utils.h>
 #include <libemail-engine/e-mail-session.h>
 #include <libemail-engine/mail-config.h>
 #include <libemail-engine/mail-ops.h>
 #include <libemail-utils/e-account-utils.h>
-#else  /* EVOLUTION_SHELL_3_3_5 */
-#include <mail/e-mail-folder-utils.h>
+#elif defined(EVOLUTION_SHELL_3_2)
+#include <mail/em-utils.h>
+#include <mail/e-mail.h>
 #include <mail/mail-config.h>
 #include <mail/mail-ops.h>
 #include <e-util/e-account-utils.h>
-#ifdef EVOLUTION_SHELL_2_91
-#include <mail/e-mail-session.h>
-#else  /* EVOLUTION_SHELL_2_91 */
+#elif defined(EVOLUTION_SHELL_2_91)
+#include <mail/e-mail.h>
+#include <mail/mail-config.h>
+#include <mail/mail-ops.h>
+#include <e-util/e-account-utils.h>
+#else /* OLDER, mostly 2.32 or so */
+#include <mail/mail-config.h>
+#include <mail/mail-ops.h>
 #include <mail/mail-session.h>
-#endif /* EVOLUTION_SHELL_2_91 */
-#endif /* EVOLUTION_SHELL_3_3_5 */
+#include <e-util/e-account-utils.h>
+#endif
 
-#include <mail/e-mail-backend.h>
+/* Remaining includes which are in ALL versions: */
 #include <shell/e-shell.h>
 
 #include <e-util/e-config.h>
 
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
+#include <libedataserver/eds-version.h>
 
+/* Back to sanity */
 #include <libtracker-sparql/tracker-sparql.h>
 
 #include <libtracker-common/tracker-date-time.h>