New header to prevent recursive #include problems

	* providers/imap/camel-imap-types.h: New header to prevent
	recursive #include problems

	* providers/imap/*.h: Replace some #includes with #include
	"camel-imap-types.h", remove typedefs that were moved to
	camel-imap-types.h

	* providers/imap/*.c: Add #includes to make up for #includes
	removed from .h files

	* providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Add
	camel-imap-types.h

svn path=/trunk/; revision=7367

1 files changed, 3 insertions, 2 deletions

diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
index cf237f155e..6863782c8a 100644
--- a/camel/providers/imap/camel-imap-folder.h
+++ b/camel/providers/imap/camel-imap-folder.h
@@ -33,6 +33,7 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus }*/
 
+#include "camel-imap-types.h"
 #include "camel-folder.h"
 #include <camel/camel-folder-search.h>
 
@@ -41,13 +42,13 @@ extern "C" {
 #define CAMEL_IMAP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolderClass))
 #define CAMEL_IS_IMAP_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_FOLDER_TYPE))
 
-typedef struct {
+struct _CamelImapFolder {
 	CamelFolder parent_object;
 
 	struct _CamelImapFolderPrivate *priv;
 
 	CamelFolderSearch *search;
-} CamelImapFolder;
+};
 
 
 typedef struct {