[evolution-kolab/ek-wip-porting: 7/14] IMAPX: cleanups in CamelIMAPXExtdFolder, CamelIMAPXExtdStore

[Christian Hilberg <chilberg src gnome org>]

commit 95ff8d96ba0a0b2979772423c21ae516b3757a1e
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Tue Mar 13 17:33:46 2012 +0100

    IMAPX: cleanups in CamelIMAPXExtdFolder, CamelIMAPXExtdStore
    
    * CamelIMAPXExtdStore: put folder type assertion back in place
    * CamelIMAPXExtdFolder: implemented UIDVALIDITY getter

 .../providers/imapx/camel-imapx-extd-folder.c      |   11 ++++-------
 src/camel/providers/imapx/camel-imapx-extd-store.c |   12 +++++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/src/camel/providers/imapx/camel-imapx-extd-folder.c b/src/camel/providers/imapx/camel-imapx-extd-folder.c
index 90e2be1..fb887ef 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-folder.c
+++ b/src/camel/providers/imapx/camel-imapx-extd-folder.c
@@ -167,7 +167,7 @@ imapx_extd_folder_append_message_sync (CamelFolder *self,
 	g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (self));
 	g_assert (CAMEL_IS_MIME_MESSAGE (message));
 	/* info may be NULL */ /* FIXME correct? */
-	g_assert (*appended_uid == NULL);
+	/* FIXME what can we assert for **appended_uid? */
 	/* cancellable may be NULL */
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
@@ -311,17 +311,14 @@ static guint64
 imapx_extd_folder_get_uidvalidity (CamelIMAPXExtdFolder *self,
                                    GError **err)
 {
-	guint64 uidvalidity = 0;
+	CamelIMAPXFolder *ifolder = NULL;
 
 	g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (self));
 	g_return_val_if_fail (err == NULL || *err == NULL, 0);
 
-	/* FIXME implement me */
-	g_error ("%s: FIXME implement me", __func__);
+	ifolder = CAMEL_IMAPX_FOLDER (self);
 
-	/* TODO read the uidvalidity value from parent object */
-
-	return uidvalidity;
+	return ifolder->uidvalidity_on_server;
 }
 /*----------------------------------------------------------------------------*/
 /* class init */
diff --git a/src/camel/providers/imapx/camel-imapx-extd-store.c b/src/camel/providers/imapx/camel-imapx-extd-store.c
index 0587256..266ac86 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-store.c
+++ b/src/camel/providers/imapx/camel-imapx-extd-store.c
@@ -351,13 +351,9 @@ imapx_extd_store_get_folder_sync (CamelStore *self,
 	                                        foldername,
 	                                        flags,
 	                                        err);
-	/* FIXME */
-	g_warning ("%s: FIXME getting CamelIMAPXFolder, expected CamelIMAPXExtdFolder",
-	           __func__);
-#if 0
 	if (folder != NULL)
 		g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (folder));
-#endif
+
 	return folder;
 }
 
@@ -476,6 +472,9 @@ imapx_extd_store_delete_folder_sync (CamelStore *self,
 	                                             foldername,
 	                                             cancellable,
 	                                             err);
+
+	/* FIXME delete metadata from CamelIMAPXExtdServer */
+
 	return ok;
 }
 
@@ -499,6 +498,9 @@ imapx_extd_store_rename_folder_sync (CamelStore *self,
 	                                             newname,
 	                                             cancellable,
 	                                             err);
+
+	/* FIXME update metadata in CamelIMAPXExtdServer */
+
 	return ok;
 }