[evolution-kolab/ek-wip-porting] CamelIMAPXExtdConnManager: improved type safety (API change)



commit 2774fe5551cf2301052a756056cb2a39b200da4b
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Tue Jan 10 11:30:25 2012 +0100

    CamelIMAPXExtdConnManager: improved type safety (API change)
    
    * let the camel_imapx_extd_conn_manager_new() function take
      a CamelIMAPXExtdStore instance as an argument, instead
      of the more general CamelStore (as the parent class does)
    * that way, we should be a little more sure that we're dealing
      with *Extd* class instances where we need them

 .../imapx/camel-imapx-extd-conn-manager.c          |   23 ++++++++++---------
 .../imapx/camel-imapx-extd-conn-manager.h          |    3 +-
 2 files changed, 14 insertions(+), 12 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 3ec4fa5..8ecb3b0 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-conn-manager.c
+++ b/src/camel/providers/imapx/camel-imapx-extd-conn-manager.c
@@ -82,10 +82,10 @@ camel_imapx_extd_conn_manager_class_init (CamelIMAPXExtdConnManagerClass *klass)
 
 	g_type_class_add_private (klass, sizeof (CamelIMAPXExtdConnManagerPrivate));
 
-	gobj_p_class = G_OBJECT_CLASS (camel_imapx_extd_conn_manager_parent_class);;
+	gobj_p_class = G_OBJECT_CLASS (camel_imapx_extd_conn_manager_parent_class);
 	object_class->set_property = gobj_p_class->set_property;
 	object_class->get_property = gobj_p_class->get_property;
-	
+
 	object_class->dispose = camel_imapx_extd_conn_manager_dispose;
 	object_class->finalize = camel_imapx_extd_conn_manager_finalize;
 
@@ -105,15 +105,16 @@ camel_imapx_extd_conn_manager_class_init (CamelIMAPXExtdConnManagerClass *klass)
 /* API functions */
 
 CamelIMAPXExtdConnManager*
-camel_imapx_extd_conn_manager_new (CamelStore *store)
+camel_imapx_extd_conn_manager_new (CamelIMAPXExtdStore *store)
 {
 	CamelIMAPXExtdConnManager *self = NULL;
-	
-	g_return_val_if_fail (CAMEL_IS_STORE (store), NULL);
 
-	self = g_object_new (CAMEL_TYPE_IMAPX_EXTD_CONN_MANAGER,
-	                     "store", store, NULL);
+	g_return_val_if_fail (CAMEL_IS_IMAPX_EXTD_STORE (store), NULL);
 
+	self = g_object_new (CAMEL_TYPE_IMAPX_EXTD_CONN_MANAGER,
+	                     "store",
+	                     CAMEL_STORE (store),
+	                     NULL);
 	return self;
 }
 
@@ -122,12 +123,12 @@ camel_imapx_extd_conn_manager_get_store (CamelIMAPXExtdConnManager *self)
 {
 	CamelStore *store = NULL;
 	CamelIMAPXConnManager *con_man = NULL;
-	
+
 	g_return_val_if_fail (CAMEL_IS_IMAPX_EXTD_CONN_MANAGER (self), NULL);
 
 	con_man = CAMEL_IMAPX_CONN_MANAGER (self);
 	store = camel_imapx_conn_manager_get_store (con_man);
-	
+
 	return store;
 }
 
@@ -141,7 +142,7 @@ camel_imapx_extd_conn_manager_get_connection (CamelIMAPXExtdConnManager *self,
 	CamelIMAPXExtdServer *es = NULL;
 	CamelIMAPXConnManager *con_man = NULL;
 	GError *tmp_err = NULL;
-	
+
 	g_assert (CAMEL_IS_IMAPX_EXTD_CONN_MANAGER (self));
 	g_assert (foldername != NULL);
 	/* cancellable may be NULL */
@@ -178,7 +179,7 @@ camel_imapx_extd_conn_manager_get_connections (CamelIMAPXExtdConnManager *self)
 {
 	GList *cn = NULL;
 	CamelIMAPXConnManager *con_man = NULL;
-	
+
 	g_assert (CAMEL_IS_IMAPX_EXTD_CONN_MANAGER (self));
 
 	con_man = CAMEL_IMAPX_CONN_MANAGER (self);
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 302da82..4ab5506 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-conn-manager.h
+++ b/src/camel/providers/imapx/camel-imapx-extd-conn-manager.h
@@ -36,6 +36,7 @@
 
 #include "camel-imapx-conn-manager.h"
 #include "camel-imapx-extd-server.h"
+#include "camel-imapx-extd-store.h"
 
 /*----------------------------------------------------------------------------*/
 /* Standard GObject macros */
@@ -77,7 +78,7 @@ GType
 camel_imapx_extd_conn_manager_get_type (void);
 
 CamelIMAPXExtdConnManager*
-camel_imapx_extd_conn_manager_new (CamelStore *store);
+camel_imapx_extd_conn_manager_new (CamelIMAPXExtdStore *store);
 
 CamelStore*
 camel_imapx_extd_conn_manager_get_store (CamelIMAPXExtdConnManager *self);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]