[evolution-kolab/ek-wip-porting] CamelIMAPXExtdServer: call our own authenticate()

[Christian Hilberg <chilberg src gnome org>]

commit 2cc3df2d7f50fa4d1d1ddb4dbf1fc029d360afae
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Wed Mar 7 16:09:06 2012 +0100

    CamelIMAPXExtdServer: call our own authenticate()
    
    * call local authenticate() function instead the parent's
      authenticate()
    * put the proper instance checks back in place

 .../providers/imapx/camel-imapx-extd-server.c      |   12 +-----------
 .../providers/imapx/camel-imapx-extd-server.h      |    2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/src/camel/providers/imapx/camel-imapx-extd-server.c b/src/camel/providers/imapx/camel-imapx-extd-server.c
index ce691dc..455ab99 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-server.c
+++ b/src/camel/providers/imapx/camel-imapx-extd-server.c
@@ -1833,13 +1833,9 @@ camel_imapx_extd_server_authenticate (CamelIMAPXServer *self,
                                       GCancellable *cancellable,
                                       GError **err)
 {
-	CamelIMAPXExtdServerClass *klass = NULL; /* FIXME */
+	CamelIMAPXExtdServerClass *klass = NULL;
 	CamelAuthenticationResult result = CAMEL_AUTHENTICATION_ERROR;
 
-	/* FIXME */
-	g_warning ("%s: FIXME getting CamelIMAPXServer, expected CamelIMAPXExtdServer",
-	           __func__);
-#if 0 /* FIXME */
 	g_return_val_if_fail (CAMEL_IS_IMAPX_EXTD_SERVER (self), CAMEL_AUTHENTICATION_REJECTED);
 
 	klass = CAMEL_IMAPX_EXTD_SERVER_GET_CLASS (self);
@@ -1847,12 +1843,6 @@ camel_imapx_extd_server_authenticate (CamelIMAPXServer *self,
 	                              mechanism,
 	                              cancellable,
 	                              err);
-#endif
-	/* FIXME */
-	result = camel_imapx_server_authenticate (self,
-	                                          mechanism,
-	                                          cancellable,
-	                                          err);
 	return result;
 }
 
diff --git a/src/camel/providers/imapx/camel-imapx-extd-server.h b/src/camel/providers/imapx/camel-imapx-extd-server.h
index cd72a8a..753c38e 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-server.h
+++ b/src/camel/providers/imapx/camel-imapx-extd-server.h
@@ -307,6 +307,6 @@ G_END_DECLS
 
 /*----------------------------------------------------------------------------*/
 
-#endif /* CAMEL_IMAPX_SERVER_EXTN_H_ */
+#endif /* CAMEL_IMAPX_EXTD_SERVER_H_ */
 
 /*----------------------------------------------------------------------------*/