[evolution-kolab: 9/13] KolabMailImapClient: adapted to Camel changes

[Christian Hilberg <chilberg src gnome org>]

commit 3d4f380155a3df7a6405bd9effe5c613e9437af3
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Fri May 25 17:05:41 2012 +0200

    KolabMailImapClient: adapted to Camel changes
    
    * removed inclusion of individual camel header
    * use new uidvalidity getter function from
      libekolabutil
    * removed unused symbol
    * pass GCancellable on to CamelService
      connect/disconnect functions

 src/libekolab/kolab-mail-imap-client.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/libekolab/kolab-mail-imap-client.c b/src/libekolab/kolab-mail-imap-client.c
index a9f772d..1978c83 100644
--- a/src/libekolab/kolab-mail-imap-client.c
+++ b/src/libekolab/kolab-mail-imap-client.c
@@ -31,7 +31,6 @@
 
 #include <camel/camel-kolab-imapx-provider.h>
 #include <camel/camel-kolab-imapx-store.h>
-#include <camel/camel-kolab-imapx-folder.h>
 #include <camel/camel-kolab-session.h>
 
 #include <libekolabutil/camel-system-headers.h>
@@ -769,7 +768,6 @@ kolab_mail_imap_client_bringup (KolabMailImapClient *self,
 	CamelService *service = NULL;
 	gchar *dbpath = NULL;
 	gchar *account_uid = NULL;
-	gchar *extd_account_uid = NULL;
 	GError *tmp_err = NULL;
 	gboolean ok = FALSE;
 
@@ -967,7 +965,9 @@ kolab_mail_imap_client_go_online (KolabMailImapClient *self,
 	priv->foldername = NULL;
 
 	/* connect the camel service */
-	ok = camel_service_connect_sync (CAMEL_SERVICE (priv->store), &tmp_err);
+	ok = camel_service_connect_sync (CAMEL_SERVICE (priv->store),
+	                                 cancellable,
+	                                 &tmp_err);
 	camel_kolab_session_set_token_pin (priv->session, NULL); /* forget pin */
 	if (! ok) {
 		g_propagate_error (err, tmp_err);
@@ -1027,6 +1027,7 @@ kolab_mail_imap_client_go_offline (KolabMailImapClient *self,
 
 	ok = camel_service_disconnect_sync (CAMEL_SERVICE (priv->store),
 	                                    TRUE, /* try to disconnect cleanly */
+	                                    cancellable,
 	                                    &tmp_err);
 	if (! ok) {
 		g_propagate_error (err, tmp_err);
@@ -1161,8 +1162,7 @@ kolab_mail_imap_client_get_folder_uidvalidity (KolabMailImapClient *self,
 	 *      read 0 (zero), so we cannot detect a change
 	 *      there presently
 	 */
-	uidvalidity = camel_kolab_imapx_folder_get_uidvalidity (CAMEL_KOLAB_IMAPX_FOLDER (folder),
-	                                                        &tmp_err);
+	uidvalidity = kolab_util_camel_imapx_folder_get_uidvalidity (CAMEL_IMAPX_FOLDER (folder));
 	g_object_unref (folder);
 	if (tmp_err != NULL) {
 		g_propagate_error (err, tmp_err);