5 files changed, 12 insertions, 7 deletions
diff --git a/camel/providers/imap4/camel-imap4-engine.c b/camel/providers/imap4/camel-imap4-engine.c
index 75831fa0b3..a84ac1dfba 100644
--- a/camel/providers/imap4/camel-imap4-engine.c
+++ b/camel/providers/imap4/camel-imap4-engine.c
@@ -54,7 +54,7 @@ camel_imap4_engine_get_type (void)
 	static CamelType type = 0;
 	
 	if (!type) {
-		type = camel_type_register (CAMEL_TYPE_IMAP4_ENGINE,
+		type = camel_type_register (camel_object_get_type (),
 					    "CamelIMAP4Engine",
 					    sizeof (CamelIMAP4Engine),
 					    sizeof (CamelIMAP4EngineClass),
diff --git a/camel/providers/imap4/camel-imap4-folder.c b/camel/providers/imap4/camel-imap4-folder.c
index 2169f053ce..9c88e596aa 100644
--- a/camel/providers/imap4/camel-imap4-folder.c
+++ b/camel/providers/imap4/camel-imap4-folder.c
@@ -74,7 +74,7 @@ camel_imap4_folder_get_type (void)
 	static CamelType type = 0;
 	
 	if (!type) {
-		type = camel_type_register (CAMEL_TYPE_IMAP4_FOLDER,
+		type = camel_type_register (CAMEL_FOLDER_TYPE,
 					    "CamelIMAP4Folder",
 					    sizeof (CamelIMAP4Folder),
 					    sizeof (CamelIMAP4FolderClass),
@@ -204,6 +204,12 @@ camel_imap4_folder_new (CamelStore *store, const char *full_name, CamelException
 }
 
 
+const char *
+camel_imap4_folder_utf7_name (CamelIMAP4Folder *folder)
+{
+	return folder->utf7_name;
+}
+
 
 static struct {
 	const char *name;
diff --git a/camel/providers/imap4/camel-imap4-store.c b/camel/providers/imap4/camel-imap4-store.c
index 3dd1120f5d..832613bb10 100644
--- a/camel/providers/imap4/camel-imap4-store.c
+++ b/camel/providers/imap4/camel-imap4-store.c
@@ -75,7 +75,7 @@ camel_imap4_store_get_type (void)
 	static CamelType type = 0;
 	
 	if (!type) {
-		type = camel_type_register (CAMEL_TYPE_IMAP4_STORE,
+		type = camel_type_register (CAMEL_STORE_TYPE,
 					    "CamelIMAP4Store",
 					    sizeof (CamelIMAP4Store),
 					    sizeof (CamelIMAP4StoreClass),
@@ -958,8 +958,7 @@ imap4_build_folder_info (CamelIMAP4Engine *engine, guint32 flags, GPtrArray *arr
 		array->pdata[i] = fi;
 	}
 	
-	/* FIXME: build the fi tree */
-	fi = array->pdata[0];
+	fi = camel_folder_info_build (array, top, '/', TRUE);
 	
 	camel_url_free (url);
 	
diff --git a/camel/providers/imap4/camel-imap4-stream.c b/camel/providers/imap4/camel-imap4-stream.c
index f2b2cbeb4b..de14f4e4ef 100644
--- a/camel/providers/imap4/camel-imap4-stream.c
+++ b/camel/providers/imap4/camel-imap4-stream.c
@@ -56,7 +56,7 @@ camel_imap4_stream_get_type (void)
 	static CamelType type = 0;
 	
 	if (!type) {
-		type = camel_type_register (CAMEL_TYPE_IMAP4_STREAM,
+		type = camel_type_register (CAMEL_STREAM_TYPE,
 					    "CamelIMAP4Stream",
 					    sizeof (CamelIMAP4Stream),
 					    sizeof (CamelIMAP4StreamClass),
diff --git a/camel/providers/imap4/camel-imap4-summary.c b/camel/providers/imap4/camel-imap4-summary.c
index fdc1e3cd52..4c181c4ab4 100644
--- a/camel/providers/imap4/camel-imap4-summary.c
+++ b/camel/providers/imap4/camel-imap4-summary.c
@@ -67,7 +67,7 @@ camel_imap4_summary_get_type (void)
 	static CamelType type = 0;
 	
 	if (!type) {
-		type = camel_type_register (CAMEL_TYPE_IMAP4_SUMMARY,
+		type = camel_type_register (CAMEL_FOLDER_SUMMARY_TYPE,
 					    "CamelIMAP4Summary",
 					    sizeof (CamelIMAP4Summary),
 					    sizeof (CamelIMAP4SummaryClass),