[evolution-kolab/ek-wip-porting: 4/5] CamelKolabIMAPX{Folder, Store}: Fixed object type issue

[Christian Hilberg <chilberg src gnome org>]

commit 5c207c666bc8345d85ba10014876e6f19defe59d
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Tue Mar 6 13:59:00 2012 +0100

    CamelKolabIMAPX{Folder,Store}: Fixed object type issue
    
    * in camel_kolab_imapx_folder_new(), create object
      of the proper type
    * now getting CamelKolabIMAPXFolder in
      CamelKolabIMAPXStore::get_folder() as
      expected

 src/camel/camel-kolab-imapx-folder.c |    2 +-
 src/camel/camel-kolab-imapx-store.c  |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/camel/camel-kolab-imapx-folder.c b/src/camel/camel-kolab-imapx-folder.c
index cd66e11..955c9b5 100644
--- a/src/camel/camel-kolab-imapx-folder.c
+++ b/src/camel/camel-kolab-imapx-folder.c
@@ -160,7 +160,7 @@ camel_kolab_imapx_folder_new (CamelKolabIMAPXStore *store,
 	else
 		short_name = folder_name;
 
-	kfolder = g_object_new (CAMEL_TYPE_IMAPX_EXTD_FOLDER,
+	kfolder = g_object_new (CAMEL_TYPE_KOLAB_IMAPX_FOLDER,
 	                        "display-name", short_name,
 	                        "full_name", folder_name,
 	                        "parent-store", store, NULL);
diff --git a/src/camel/camel-kolab-imapx-store.c b/src/camel/camel-kolab-imapx-store.c
index ff5425c..4a62056 100644
--- a/src/camel/camel-kolab-imapx-store.c
+++ b/src/camel/camel-kolab-imapx-store.c
@@ -435,13 +435,9 @@ kolab_imapx_store_get_folder_sync (CamelStore *self,
 	                                         foldername,
 	                                         flags,
 	                                         err);
-	/* FIXME */
-	g_warning ("%s: FIXME getting CamelIMAPXFolder, expected CamelKolabIMAPXFolder",
-	           __func__);
-#if 0
 	if (folder != NULL)
 		g_assert (CAMEL_IS_KOLAB_IMAPX_FOLDER (folder));
-#endif
+
 	return folder;
 }