[evolution-kolab/ek-wip-porting] CamelKolabIMAPXConnManager: object type (cast) fixups

[Christian Hilberg <chilberg src gnome org>]

commit 9864472af277f3f957396b7d4ac6c4f48c1a5627
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Thu Jan 12 19:28:44 2012 +0100

    CamelKolabIMAPXConnManager: object type (cast) fixups
    
    * fixed object type casts according to this class'
      CamelIMAPXExtdConnManager counterpart changes

 src/camel/camel-kolab-imapx-conn-manager.c |   10 +++++-----
 src/camel/camel-kolab-imapx-conn-manager.h |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/camel/camel-kolab-imapx-conn-manager.c b/src/camel/camel-kolab-imapx-conn-manager.c
index aac095a..9ca87ee 100644
--- a/src/camel/camel-kolab-imapx-conn-manager.c
+++ b/src/camel/camel-kolab-imapx-conn-manager.c
@@ -108,10 +108,10 @@ camel_kolab_imapx_conn_manager_new (CamelKolabIMAPXStore *store)
 	return self;
 }
 
-CamelStore*
+CamelKolabIMAPXStore*
 camel_kolab_imapx_conn_manager_get_store (CamelKolabIMAPXConnManager *self)
 {
-	CamelStore *store = NULL;
+	CamelIMAPXExtdStore *store = NULL;
 	CamelIMAPXExtdConnManager *con_man = NULL;
 
 	g_return_val_if_fail (CAMEL_IS_KOLAB_IMAPX_CONN_MANAGER (self), NULL);
@@ -119,7 +119,7 @@ camel_kolab_imapx_conn_manager_get_store (CamelKolabIMAPXConnManager *self)
 	con_man = CAMEL_IMAPX_EXTD_CONN_MANAGER (self);
 	store = camel_imapx_extd_conn_manager_get_store (con_man);
 
-	return store;
+	return CAMEL_KOLAB_IMAPX_STORE (store);
 }
 
 CamelKolabIMAPXServer*
@@ -128,7 +128,7 @@ camel_kolab_imapx_conn_manager_get_connection (CamelKolabIMAPXConnManager *self,
                                                GCancellable *cancellable,
                                                GError **err)
 {
-	CamelIMAPXServer *es = NULL;
+	CamelIMAPXExtdServer *es = NULL;
 	CamelKolabIMAPXServer *ks = NULL;
 	CamelIMAPXExtdConnManager *con_man = NULL;
 	GError *tmp_err = NULL;
@@ -170,7 +170,7 @@ camel_kolab_imapx_conn_manager_get_connections (CamelKolabIMAPXConnManager *self
 	GList *cn = NULL;
 	CamelIMAPXExtdConnManager *con_man = NULL;
 
-	g_assert (CAMEL_IS_KOLAB_CONN_MANAGER (self));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_CONN_MANAGER (self));
 
 	con_man = CAMEL_IMAPX_EXTD_CONN_MANAGER (self);
 	cn = camel_imapx_extd_conn_manager_get_connections (con_man);
diff --git a/src/camel/camel-kolab-imapx-conn-manager.h b/src/camel/camel-kolab-imapx-conn-manager.h
index 158bc91..5e2168c 100644
--- a/src/camel/camel-kolab-imapx-conn-manager.h
+++ b/src/camel/camel-kolab-imapx-conn-manager.h
@@ -79,7 +79,7 @@ camel_kolab_imapx_conn_manager_get_type (void);
 CamelKolabIMAPXConnManager*
 camel_kolab_imapx_conn_manager_new (CamelKolabIMAPXStore *store);
 
-CamelStore*
+CamelKolabIMAPXStore*
 camel_kolab_imapx_conn_manager_get_store (CamelKolabIMAPXConnManager *self);
 
 CamelKolabIMAPXServer*
@@ -92,7 +92,7 @@ void
 camel_kolab_imapx_conn_manager_close_connections (CamelKolabIMAPXConnManager *self);
 
 GList*
-camel_imapx_extd_conn_manager_get_connections (CamelIMAPXExtdConnManager *self);
+camel_kolab_imapx_conn_manager_get_connections (CamelKolabIMAPXConnManager *self);
 
 void
 camel_kolab_imapx_conn_manager_update_con_info (CamelKolabIMAPXConnManager *self,