[evolution-kolab/ek-wip-porting] CamelIMAPXExtdConnManager: API cleanup

[Christian Hilberg <chilberg src gnome org>]

commit 79089230a8194d868efe95f1d30809521d144c9b
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Fri Mar 9 18:01:16 2012 +0100

    CamelIMAPXExtdConnManager: API cleanup
    
    * override parent's get_connection() function with our
      own implementation
    * API function for this one not needed, since parent
      function is virtualized, so the parent's API function
      can be used

 .../imapx/camel-imapx-extd-conn-manager.c          |   23 ++-----------------
 .../imapx/camel-imapx-extd-conn-manager.h          |   11 ---------
 2 files changed, 3 insertions(+), 31 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 1dc4323..1f7722c 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-conn-manager.c
+++ b/src/camel/providers/imapx/camel-imapx-extd-conn-manager.c
@@ -268,6 +268,7 @@ camel_imapx_extd_conn_manager_class_init (CamelIMAPXExtdConnManagerClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	GObjectClass *gobj_p_class = NULL;
+	CamelIMAPXConnManagerClass *parent_class = CAMEL_IMAPX_CONN_MANAGER_CLASS (klass);
 
 	gobj_p_class = G_OBJECT_CLASS (camel_imapx_extd_conn_manager_parent_class);
 	object_class->set_property = gobj_p_class->set_property;
@@ -276,8 +277,9 @@ camel_imapx_extd_conn_manager_class_init (CamelIMAPXExtdConnManagerClass *klass)
 	object_class->dispose = camel_imapx_extd_conn_manager_dispose;
 	object_class->finalize = camel_imapx_extd_conn_manager_finalize;
 
+	parent_class->get_connection = imapx_extd_conn_manager_get_connection;
+
 	klass->get_store = imapx_extd_conn_manager_get_store;
-	klass->get_connection = imapx_extd_conn_manager_get_connection;
 	klass->close_connections = imapx_extd_conn_manager_close_connections;
 	klass->get_connections = imapx_extd_conn_manager_get_connections;
 	klass->update_con_info = imapx_extd_conn_manager_update_con_info;
@@ -325,25 +327,6 @@ camel_imapx_extd_conn_manager_get_store (CamelIMAPXConnManager *self)
 	return store;
 }
 
-CamelIMAPXServer*
-camel_imapx_extd_conn_manager_get_connection (CamelIMAPXConnManager *self,
-                                              const gchar *foldername,
-                                              GCancellable *cancellable,
-                                              GError **err)
-{
-	CamelIMAPXServer *server = 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);
-	server = klass->get_connection (self,
-	                                foldername,
-	                                cancellable,
-	                                err);
-	return server;
-}
-
 void
 camel_imapx_extd_conn_manager_close_connections (CamelIMAPXConnManager *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 bbe1f88..1888931 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-conn-manager.h
+++ b/src/camel/providers/imapx/camel-imapx-extd-conn-manager.h
@@ -75,11 +75,6 @@ struct _CamelIMAPXExtdConnManagerClass {
 
 	CamelStore* (*get_store) (CamelIMAPXConnManager *self);
 
-	CamelIMAPXServer* (*get_connection) (CamelIMAPXConnManager *self,
-	                                     const gchar *foldername,
-	                                     GCancellable *cancellable,
-	                                     GError **err);
-
 	void (*close_connections) (CamelIMAPXConnManager *self);
 
 	GList* (*get_connections) (CamelIMAPXConnManager *self);
@@ -98,12 +93,6 @@ camel_imapx_extd_conn_manager_new (CamelIMAPXExtdStore *store);
 CamelStore*
 camel_imapx_extd_conn_manager_get_store (CamelIMAPXConnManager *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 (CamelIMAPXConnManager *self);