[evolution-kolab/ek-wip-porting] CamelKolabIMAPXServer: private member fixups

[Christian Hilberg <chilberg src gnome org>]

commit deb486282a97ee93e0eacd76d8e94b590f0243aa
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Sat Mar 10 20:19:38 2012 +0100

    CamelKolabIMAPXServer: private member fixups
    
    * removed private member foe CamelStore
      from CamelKolabIMAPXServer
    * CamelIMAPXServer has one for binding
      the store, so we're using this one

 src/camel/camel-kolab-imapx-server.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/src/camel/camel-kolab-imapx-server.c b/src/camel/camel-kolab-imapx-server.c
index b6c107e..c3bffd1 100644
--- a/src/camel/camel-kolab-imapx-server.c
+++ b/src/camel/camel-kolab-imapx-server.c
@@ -40,7 +40,6 @@
 
 typedef struct _CamelKolabIMAPXServerPrivate CamelKolabIMAPXServerPrivate;
 struct _CamelKolabIMAPXServerPrivate {
-	CamelKolabIMAPXStore *kstore; /* Kolab Camel store */
 	CamelKolabImapxMetadata *kmd; /* Kolab metadata (differs from IMAPX metadata!) */
 };
 
@@ -233,7 +232,7 @@ kolab_imapx_server_get_foldertype (CamelKolabIMAPXServer *self,
 	}
 
 	/* check whether we are online */
-	ostore = CAMEL_OFFLINE_STORE (priv->kstore);
+	ostore = CAMEL_OFFLINE_STORE (CAMEL_IMAPX_SERVER (self)->store);
 	if (! camel_offline_store_get_online (ostore)) {
 		/* TODO turn this into proper GError */
 		g_warning ("%s: must be online to complete this operation",
@@ -242,8 +241,7 @@ kolab_imapx_server_get_foldertype (CamelKolabIMAPXServer *self,
 	}
 
 	/* TODO check whether we're authenticated */
-	g_warning ("%s: FIXME implement authenticated check",
-	           __func__);
+	g_debug ("%s: implement authenticated check", __func__);
 
 	/* if not in sqlite db: issue IMAP query */
 	eserver = CAMEL_IMAPX_EXTD_SERVER (self);
@@ -328,7 +326,7 @@ kolab_imapx_server_set_foldertype (CamelKolabIMAPXServer *self,
 	priv = CAMEL_KOLAB_IMAPX_SERVER_PRIVATE (self);
 
 	/* check whether we're online */
-	ostore = CAMEL_OFFLINE_STORE (priv->kstore);
+	ostore = CAMEL_OFFLINE_STORE (CAMEL_IMAPX_SERVER (self)->store);
 	if (! camel_offline_store_get_online (ostore)) {
 		/* TODO turn this into proper GError */
 		g_warning ("%s: must be online to complete this operation",
@@ -337,8 +335,7 @@ kolab_imapx_server_set_foldertype (CamelKolabIMAPXServer *self,
 	}
 
 	/* TODO check whether we're authenticated */
-	g_warning ("%s: FIXME implement authenticated check",
-	           __func__);
+	g_debug ("%s: implement authenticated check", __func__);
 
 	eserver = CAMEL_IMAPX_EXTD_SERVER (self);
 
@@ -509,7 +506,7 @@ camel_kolab_imapx_server_retrieve_all_folder_types (CamelKolabIMAPXServer *self,
 	priv = CAMEL_KOLAB_IMAPX_SERVER_PRIVATE (self);
 
 	/* check whether we're online */
-	ostore = CAMEL_OFFLINE_STORE (priv->kstore);
+	ostore = CAMEL_OFFLINE_STORE (CAMEL_IMAPX_SERVER (self)->store);
 	if (! camel_offline_store_get_online (ostore)) {
 		/* TODO turn this into proper GError */
 		g_warning ("%s: must be online to complete this operation",
@@ -518,8 +515,7 @@ camel_kolab_imapx_server_retrieve_all_folder_types (CamelKolabIMAPXServer *self,
 	}
 
 	/* TODO check whether we're authenticated */
-	g_warning ("%s: FIXME implement authenticated check",
-	           __func__);
+	g_debug ("%s: implement authenticated check", __func__);
 
 	eserver = CAMEL_IMAPX_EXTD_SERVER (self);