[evolution-kolab/ek-wip-porting] CamelKolabImapxMetadataDb: removed header file dependencies

[Christian Hilberg <chilberg src gnome org>]

commit ff6d6847ab632935d47b864a924e360a7febc1bd
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Jan 16 19:02:34 2012 +0100

    CamelKolabImapxMetadataDb: removed header file dependencies
    
    * moved dependency on CamelImapxMetadata and CamelKolabIMAPXFolder
      out from the header file and into the implementation file
    * added forward declaration of struct _CamelKolabImapxFolderMetadata
      to header

 src/camel/camel-kolab-imapx-metadata-db.c |    2 ++
 src/camel/camel-kolab-imapx-metadata-db.h |   12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/camel/camel-kolab-imapx-metadata-db.c b/src/camel/camel-kolab-imapx-metadata-db.c
index f776df9..75206fa 100644
--- a/src/camel/camel-kolab-imapx-metadata-db.c
+++ b/src/camel/camel-kolab-imapx-metadata-db.c
@@ -52,7 +52,9 @@
 #include <libekolabutil/kolab-util-error.h>
 
 #include <camel/providers/imapx/camel-imapx-utils.h>
+#include <camel/providers/imapx/camel-imapx-metadata.h>
 
+#include "camel-kolab-imapx-folder.h"
 #include "camel-kolab-imapx-metadata.h"
 #include "camel-kolab-imapx-metadata-db.h"
 
diff --git a/src/camel/camel-kolab-imapx-metadata-db.h b/src/camel/camel-kolab-imapx-metadata-db.h
index 09a0b7e..17cc0a2 100644
--- a/src/camel/camel-kolab-imapx-metadata-db.h
+++ b/src/camel/camel-kolab-imapx-metadata-db.h
@@ -33,10 +33,6 @@
 #include <glib.h>
 #include <sqlite3.h>
 
-#include <camel/providers/imapx/camel-imapx-metadata.h>
-
-#include "camel-kolab-imapx-folder.h"
-
 /*----------------------------------------------------------------------------*/
 
 typedef struct _CamelKolabImapxMetadataDb CamelKolabImapxMetadataDb;
@@ -48,6 +44,10 @@ struct _CamelKolabImapxMetadataDb {
 
 /*----------------------------------------------------------------------------*/
 
+struct _CamelKolabImapxFolderMetadata;
+
+/*----------------------------------------------------------------------------*/
+
 CamelKolabImapxMetadataDb*
 camel_kolab_imapx_metadata_db_new (void);
 
@@ -71,7 +71,7 @@ camel_kolab_imapx_metadata_db_close (CamelKolabImapxMetadataDb *mdb,
 gboolean
 camel_kolab_imapx_metadata_db_folder_update (CamelKolabImapxMetadataDb *mdb,
                                              const gchar *foldername,
-                                             const CamelKolabImapxFolderMetadata *kfmd,
+                                             const struct _CamelKolabImapxFolderMetadata *kfmd,
                                              GError **err);
 
 gboolean
@@ -79,7 +79,7 @@ camel_kolab_imapx_metadata_db_update (CamelKolabImapxMetadataDb *mdb,
                                       GHashTable *kolab_metadata,
                                       GError **err);
 
-CamelKolabImapxFolderMetadata*
+struct _CamelKolabImapxFolderMetadata*
 camel_kolab_imapx_metadata_db_lookup (CamelKolabImapxMetadataDb *mdb,
                                       const gchar *foldername,
                                       GError **err);