[evolution-kolab/ek-wip-porting] CamelIMAPXExtdConnManager: (API) object types cleanup

[Christian Hilberg <chilberg src gnome org>]

commit 756455c1b5e7267b1e4c56bd100dd09f9baed34a
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Fri Jan 13 19:34:31 2012 +0100

    CamelIMAPXExtdConnManager: (API) object types cleanup
    
    * use the most general Camel* types in (API) functions
    * this is to allow CamelIMAPXExtdConnManager to be
      used as CamelIMAPXConnManager
    * assert the CamelIMAPXExtdConnManager object type
      in the class functions

 .../imapx/camel-imapx-extd-conn-manager.c          |   90 +++++++++-----------
 .../imapx/camel-imapx-extd-conn-manager.h          |   34 ++++----
 2 files changed, 56 insertions(+), 68 deletions(-)
---
diff --git a/src/camel/providers/imapx/camel-imapx-extd-conn-manager.c b/src/camel/providers/imapx/camel-imapx-extd-conn-manager.c
index 07efcf8..6b828f7 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-conn-manager.c
+++ b/src/camel/providers/imapx/camel-imapx-extd-conn-manager.c
@@ -69,28 +69,26 @@ camel_imapx_extd_conn_manager_finalize (GObject *object)
 /*----------------------------------------------------------------------------*/
 /* class functions */
 
-static CamelIMAPXExtdStore*
-imapx_extd_conn_manager_get_store (CamelIMAPXExtdConnManager *self)
+static CamelStore*
+imapx_extd_conn_manager_get_store (CamelIMAPXConnManager *self)
 {
 	CamelStore *store = NULL;
-	CamelIMAPXConnManager *con_man = NULL;
 
-	g_return_val_if_fail (CAMEL_IS_IMAPX_EXTD_CONN_MANAGER (self), NULL);
+	g_assert (CAMEL_IS_IMAPX_EXTD_CONN_MANAGER (self));
 
-	con_man = CAMEL_IMAPX_CONN_MANAGER (self);
-	store = camel_imapx_conn_manager_get_store (con_man);
+	store = camel_imapx_conn_manager_get_store (self);
+	g_assert (CAMEL_IS_IMAPX_EXTD_STORE (store));
 
-	return CAMEL_IMAPX_EXTD_STORE (store);
+	return store;
 }
 
-static CamelIMAPXExtdServer*
-imapx_extd_conn_manager_get_connection (CamelIMAPXExtdConnManager *self,
+static CamelIMAPXServer*
+imapx_extd_conn_manager_get_connection (CamelIMAPXConnManager *self,
                                         const gchar *foldername,
                                         GCancellable *cancellable,
                                         GError **err)
 {
-	CamelIMAPXServer *is = NULL;
-	CamelIMAPXConnManager *con_man = NULL;
+	CamelIMAPXServer *server = NULL;
 	GError *tmp_err = NULL;
 
 	g_assert (CAMEL_IS_IMAPX_EXTD_CONN_MANAGER (self));
@@ -98,41 +96,37 @@ imapx_extd_conn_manager_get_connection (CamelIMAPXExtdConnManager *self,
 	/* cancellable may be NULL */
 	g_return_val_if_fail (err == NULL || *err == NULL, NULL);
 
-	con_man = CAMEL_IMAPX_CONN_MANAGER (self);
-	is = camel_imapx_conn_manager_get_connection (con_man,
-	                                              foldername,
-	                                              cancellable,
-	                                              &tmp_err);
-	if (is == NULL) {
+	server = camel_imapx_conn_manager_get_connection (self,
+	                                                  foldername,
+	                                                  cancellable,
+	                                                  &tmp_err);
+	if (server == NULL) {
 		if (tmp_err != NULL)
 			g_propagate_error (err, tmp_err);
 		return NULL;
 	}
 
-	return CAMEL_IMAPX_EXTD_SERVER (is);
+	g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (server));
+
+	return server;
 }
 
 static void
-imapx_extd_conn_manager_close_connections (CamelIMAPXExtdConnManager *self)
+imapx_extd_conn_manager_close_connections (CamelIMAPXConnManager *self)
 {
-	CamelIMAPXConnManager *con_man = NULL;
-
 	g_assert (CAMEL_IS_IMAPX_EXTD_CONN_MANAGER (self));
 
-	con_man = CAMEL_IMAPX_CONN_MANAGER (self);
-	camel_imapx_conn_manager_close_connections (con_man);
+	camel_imapx_conn_manager_close_connections (self);
 }
 
 static GList*
-imapx_extd_conn_manager_get_connections (CamelIMAPXExtdConnManager *self)
+imapx_extd_conn_manager_get_connections (CamelIMAPXConnManager *self)
 {
 	GList *cn = NULL;
-	CamelIMAPXConnManager *con_man = NULL;
 
 	g_assert (CAMEL_IS_IMAPX_EXTD_CONN_MANAGER (self));
 
-	con_man = CAMEL_IMAPX_CONN_MANAGER (self);
-	cn = camel_imapx_conn_manager_get_connections (con_man);
+	cn = camel_imapx_conn_manager_get_connections (self);
 
 	/* TODO type-check list elements? */
 
@@ -140,22 +134,16 @@ imapx_extd_conn_manager_get_connections (CamelIMAPXExtdConnManager *self)
 }
 
 static void
-imapx_extd_conn_manager_update_con_info (CamelIMAPXExtdConnManager *self,
-                                         CamelIMAPXExtdServer *server,
+imapx_extd_conn_manager_update_con_info (CamelIMAPXConnManager *self,
+                                         CamelIMAPXServer *server,
                                          const gchar *foldername)
 {
-	CamelIMAPXConnManager *con_man = NULL;
-	CamelIMAPXServer *is = NULL;
-
-	g_assert (CAMEL_IS_IMAPX_EXTD_CONN_MANAGER (con_man));
-	g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (server));
+	g_assert (CAMEL_IS_IMAPX_EXTD_CONN_MANAGER (self));
+	g_assert (CAMEL_IS_IMAPX_SERVER (server));
 	g_assert (foldername != NULL);
 
-	con_man = CAMEL_IMAPX_CONN_MANAGER (self);
-	is = CAMEL_IMAPX_SERVER (server);
-
-	camel_imapx_conn_manager_update_con_info (con_man,
-	                                          is,
+	camel_imapx_conn_manager_update_con_info (self,
+	                                          server,
 	                                          foldername);
 }
 
@@ -210,27 +198,27 @@ camel_imapx_extd_conn_manager_new (CamelIMAPXExtdStore *store)
 	return self;
 }
 
-CamelIMAPXExtdStore*
-camel_imapx_extd_conn_manager_get_store (CamelIMAPXExtdConnManager *self)
+CamelStore*
+camel_imapx_extd_conn_manager_get_store (CamelIMAPXConnManager *self)
 {
-	CamelIMAPXExtdStore *es = NULL;
+	CamelStore *store = NULL;
 	CamelIMAPXExtdConnManagerClass *klass = NULL;
 
 	g_return_val_if_fail (CAMEL_IS_IMAPX_EXTD_CONN_MANAGER (self), NULL);
 
 	klass = CAMEL_IMAPX_EXTD_CONN_MANAGER_GET_CLASS (self);
-	es = klass->get_store (self);
+	store = klass->get_store (self);
 
-	return es;
+	return store;
 }
 
-CamelIMAPXExtdServer*
-camel_imapx_extd_conn_manager_get_connection (CamelIMAPXExtdConnManager *self,
+CamelIMAPXServer*
+camel_imapx_extd_conn_manager_get_connection (CamelIMAPXConnManager *self,
                                               const gchar *foldername,
                                               GCancellable *cancellable,
                                               GError **err)
 {
-	CamelIMAPXExtdServer *server = NULL;
+	CamelIMAPXServer *server = NULL;
 	CamelIMAPXExtdConnManagerClass *klass = NULL;
 
 	g_return_val_if_fail (CAMEL_IS_IMAPX_EXTD_CONN_MANAGER (self), NULL);
@@ -244,7 +232,7 @@ camel_imapx_extd_conn_manager_get_connection (CamelIMAPXExtdConnManager *self,
 }
 
 void
-camel_imapx_extd_conn_manager_close_connections (CamelIMAPXExtdConnManager *self)
+camel_imapx_extd_conn_manager_close_connections (CamelIMAPXConnManager *self)
 {
 	CamelIMAPXExtdConnManagerClass *klass = NULL;
 
@@ -255,7 +243,7 @@ camel_imapx_extd_conn_manager_close_connections (CamelIMAPXExtdConnManager *self
 }
 
 GList*
-camel_imapx_extd_conn_manager_get_connections (CamelIMAPXExtdConnManager *self)
+camel_imapx_extd_conn_manager_get_connections (CamelIMAPXConnManager *self)
 {
 	GList *cn = NULL;
 	CamelIMAPXExtdConnManagerClass *klass = NULL;
@@ -269,8 +257,8 @@ camel_imapx_extd_conn_manager_get_connections (CamelIMAPXExtdConnManager *self)
 }
 
 void
-camel_imapx_extd_conn_manager_update_con_info (CamelIMAPXExtdConnManager *self,
-                                               CamelIMAPXExtdServer *server,
+camel_imapx_extd_conn_manager_update_con_info (CamelIMAPXConnManager *self,
+                                               CamelIMAPXServer *server,
                                                const gchar *foldername)
 {
 	CamelIMAPXExtdConnManagerClass *klass = NULL;
diff --git a/src/camel/providers/imapx/camel-imapx-extd-conn-manager.h b/src/camel/providers/imapx/camel-imapx-extd-conn-manager.h
index 34c8ff5..bbe1f88 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-conn-manager.h
+++ b/src/camel/providers/imapx/camel-imapx-extd-conn-manager.h
@@ -73,19 +73,19 @@ struct _CamelIMAPXExtdConnManagerClass {
 
 	/* public virtual functions */
 
-	CamelIMAPXExtdStore* (*get_store) (CamelIMAPXExtdConnManager *self);
+	CamelStore* (*get_store) (CamelIMAPXConnManager *self);
 
-	CamelIMAPXExtdServer* (*get_connection) (CamelIMAPXExtdConnManager *self,
-	                                         const gchar *foldername,
-	                                         GCancellable *cancellable,
-	                                         GError **err);
+	CamelIMAPXServer* (*get_connection) (CamelIMAPXConnManager *self,
+	                                     const gchar *foldername,
+	                                     GCancellable *cancellable,
+	                                     GError **err);
 
-	void (*close_connections) (CamelIMAPXExtdConnManager *self);
+	void (*close_connections) (CamelIMAPXConnManager *self);
 
-	GList* (*get_connections) (CamelIMAPXExtdConnManager *self);
+	GList* (*get_connections) (CamelIMAPXConnManager *self);
 
-	void (*update_con_info) (CamelIMAPXExtdConnManager *self,
-	                         CamelIMAPXExtdServer *server,
+	void (*update_con_info) (CamelIMAPXConnManager *self,
+	                         CamelIMAPXServer *server,
 	                         const gchar *foldername);
 };
 
@@ -95,24 +95,24 @@ camel_imapx_extd_conn_manager_get_type (void);
 CamelIMAPXExtdConnManager*
 camel_imapx_extd_conn_manager_new (CamelIMAPXExtdStore *store);
 
-CamelIMAPXExtdStore*
-camel_imapx_extd_conn_manager_get_store (CamelIMAPXExtdConnManager *self);
+CamelStore*
+camel_imapx_extd_conn_manager_get_store (CamelIMAPXConnManager *self);
 
-CamelIMAPXExtdServer*
-camel_imapx_extd_conn_manager_get_connection (CamelIMAPXExtdConnManager *self,
+CamelIMAPXServer*
+camel_imapx_extd_conn_manager_get_connection (CamelIMAPXConnManager *self,
                                               const gchar *foldername,
                                               GCancellable *cancellable,
                                               GError **err);
 
 void
-camel_imapx_extd_conn_manager_close_connections (CamelIMAPXExtdConnManager *self);
+camel_imapx_extd_conn_manager_close_connections (CamelIMAPXConnManager *self);
 
 GList*
-camel_imapx_extd_conn_manager_get_connections (CamelIMAPXExtdConnManager *self);
+camel_imapx_extd_conn_manager_get_connections (CamelIMAPXConnManager *self);
 
 void
-camel_imapx_extd_conn_manager_update_con_info (CamelIMAPXExtdConnManager *self,
-                                               CamelIMAPXExtdServer *server,
+camel_imapx_extd_conn_manager_update_con_info (CamelIMAPXConnManager *self,
+                                               CamelIMAPXServer *server,
                                                const gchar *foldername);
 
 G_END_DECLS