[tracker/evolution-plugin] plugins/evolution: Making it work with current jhbuild of Evolution

[Philip Van Hoof <pvanhoof src gnome org>]

commit 5a48b5c8d339c5eed04e34e9c672d1925352fb28
Author: Philip Van Hoof <philip codeminded be>
Date:   Thu Feb 17 14:19:51 2011 +0100

    plugins/evolution: Making it work with current jhbuild of Evolution

 configure.ac                                     |    8 +++---
 src/plugins/evolution/tracker-evolution-plugin.c |   32 +++++++++++++++++----
 2 files changed, 30 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 72f9610..d58b293 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,10 +186,10 @@ LIBFLAC_REQUIRED=1.2.1
 LIBEXIF_REQUIRED=0.6
 LIBGSF_REQUIRED=1.13
 EXEMPI_REQUIRED=2.1.0
-EVO_REQUIRED=2.92
-EVO_SHELL_REQUIRED=2.92
-EDS_REQUIRED=2.92
-CAMEL_REQUIRED=2.92
+EVO_REQUIRED=2.91.90
+EVO_SHELL_REQUIRED=2.91.90
+EDS_REQUIRED=2.91.90
+CAMEL_REQUIRED=2.91.90
 # Unlikely version for now, Nepomuk integration isn't finished in streamanalyzer atm
 LIBSTREAMANALYZER_REQUIRED=0.7.0
 GEE_REQUIRED=0.3
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index abfbee2..c12a237 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -1250,7 +1250,10 @@ get_last_deleted_time (TrackerEvolutionPlugin *self)
 				continue;
 			}
 
-			if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL))) {
+			if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session),
+			                                                        uri,
+			                                                        CAMEL_PROVIDER_STORE,
+			                                                        NULL))) {
 				continue;
 			}
 
@@ -1361,7 +1364,11 @@ register_walk_folders_in_folder (TrackerEvolutionPlugin *self,
 		/* This is asynchronous and hooked to the mail/ API, so nicely
 		 * integrated with the Evolution UI application */
 
-		mail_get_folder (iter->uri, 0, register_on_get_folder, info,
+		mail_get_folder (session,
+		                 iter->uri,
+		                 0,
+		                 register_on_get_folder,
+		                 info,
 		                 mail_msg_unordered_push);
 
 		if (iter->child) {
@@ -1431,7 +1438,11 @@ unregister_walk_folders_in_folder (TrackerEvolutionPlugin *self,
 		/* This is asynchronous and hooked to the mail/ API, so nicely
 		 * integrated with the Evolution UI application */
 
-		mail_get_folder (titer->uri, 0, unregister_on_get_folder, info,
+		mail_get_folder (session,
+		                 titer->uri,
+		                 0,
+		                 unregister_on_get_folder,
+		                 info,
 		                 mail_msg_unordered_push);
 
 		if (titer->child) {
@@ -1592,7 +1603,10 @@ introduce_account_to (TrackerEvolutionPlugin *self,
 	if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
 		return;
 
-	if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL))) {
+	if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session),
+	                                                        uri,
+	                                                        CAMEL_PROVIDER_STORE,
+	                                                        NULL))) {
 		return;
 	}
 
@@ -1888,7 +1902,10 @@ register_account (TrackerEvolutionPlugin *self,
 	if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
 		return;
 
-	if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL))) {
+	if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session),
+	                                                        uri,
+	                                                        CAMEL_PROVIDER_STORE,
+	                                                        NULL))) {
 		return;
 	}
 
@@ -1953,7 +1970,10 @@ unregister_account (TrackerEvolutionPlugin *self,
 	if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
 		return;
 
-	if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL))) {
+	if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session),
+	                                                        uri,
+	                                                        CAMEL_PROVIDER_STORE,
+	                                                        NULL))) {
 		return;
 	}