evolution-data-server r9664 - in branches/gnome-2-24/camel: . providers/groupwise providers/imap providers/local providers/nntp

[sragavan svn gnome org]

Author: sragavan
Date: Tue Oct 14 05:43:10 2008
New Revision: 9664
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9664&view=rev

Log:
2008-10-14  Srinivasa Ragavan  <sragavan novell com>

	** Fix for bug #552261

	* camel-folder-summary.c: Don't expose sqlite3 header outside.
	* camel-folder-summary.h:
	* camel-folder.c:
	* camel-store.c:
	* camel-store.h:
	* camel-vee-folder.c:
	* camel-vee-summary.c:
	* camel-vtrash-folder.c:




Modified:
   branches/gnome-2-24/camel/ChangeLog
   branches/gnome-2-24/camel/camel-folder-summary.c
   branches/gnome-2-24/camel/camel-folder-summary.h
   branches/gnome-2-24/camel/camel-folder.c
   branches/gnome-2-24/camel/camel-store.c
   branches/gnome-2-24/camel/camel-store.h
   branches/gnome-2-24/camel/camel-vee-folder.c
   branches/gnome-2-24/camel/camel-vee-summary.c
   branches/gnome-2-24/camel/camel-vtrash-folder.c
   branches/gnome-2-24/camel/providers/groupwise/ChangeLog
   branches/gnome-2-24/camel/providers/groupwise/camel-groupwise-summary.c
   branches/gnome-2-24/camel/providers/imap/ChangeLog
   branches/gnome-2-24/camel/providers/imap/camel-imap-folder.c
   branches/gnome-2-24/camel/providers/imap/camel-imap-store.c
   branches/gnome-2-24/camel/providers/imap/camel-imap-summary.c
   branches/gnome-2-24/camel/providers/local/ChangeLog
   branches/gnome-2-24/camel/providers/local/camel-local-summary.c
   branches/gnome-2-24/camel/providers/local/camel-maildir-summary.c
   branches/gnome-2-24/camel/providers/local/camel-mbox-summary.c
   branches/gnome-2-24/camel/providers/local/camel-mh-summary.c
   branches/gnome-2-24/camel/providers/local/camel-spool-summary.c
   branches/gnome-2-24/camel/providers/nntp/ChangeLog
   branches/gnome-2-24/camel/providers/nntp/camel-nntp-summary.c

Modified: branches/gnome-2-24/camel/camel-folder-summary.c
==============================================================================
--- branches/gnome-2-24/camel/camel-folder-summary.c	(original)
+++ branches/gnome-2-24/camel/camel-folder-summary.c	Tue Oct 14 05:43:10 2008
@@ -40,6 +40,7 @@
 
 #include <libedataserver/e-memory.h>
 
+#include "camel-db.h"
 #include "camel-file-utils.h"
 #include "camel-folder-summary.h"
 #include "camel-folder.h"

Modified: branches/gnome-2-24/camel/camel-folder-summary.h
==============================================================================
--- branches/gnome-2-24/camel/camel-folder-summary.h	(original)
+++ branches/gnome-2-24/camel/camel-folder-summary.h	Tue Oct 14 05:43:10 2008
@@ -27,7 +27,6 @@
 #include <camel/camel-mime-parser.h>
 #include <camel/camel-object.h>
 #include <camel/camel-index.h>
-#include <camel/camel-db.h>
 
 #define CAMEL_FOLDER_SUMMARY_TYPE         camel_folder_summary_get_type ()
 #define CAMEL_FOLDER_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_folder_summary_get_type (), CamelFolderSummary)
@@ -255,6 +254,9 @@
 	gpointer later[4];
 };
 
+struct _CamelMIRecord;
+struct _CamelFIRecord;
+
 struct _CamelFolderSummaryClass {
 	CamelObjectClass parent_class;
 
@@ -263,12 +265,12 @@
 	int (*summary_header_save)(CamelFolderSummary *, FILE *);
 
 	/* Load/Save folder summary from DB*/
-	int (*summary_header_from_db)(CamelFolderSummary *, CamelFIRecord *);
-	CamelFIRecord * (*summary_header_to_db)(CamelFolderSummary *, CamelException *ex);
+	int (*summary_header_from_db)(CamelFolderSummary *, struct _CamelFIRecord *);
+	struct _CamelFIRecord * (*summary_header_to_db)(CamelFolderSummary *, CamelException *ex);
 	CamelMessageInfo * (*message_info_from_db) (CamelFolderSummary *, struct _CamelMIRecord*);
-	CamelMIRecord * (*message_info_to_db) (CamelFolderSummary *, CamelMessageInfo *);
-	CamelMessageContentInfo * (*content_info_from_db) (CamelFolderSummary *, CamelMIRecord *);
-	int (*content_info_to_db) (CamelFolderSummary *, CamelMessageContentInfo *, CamelMIRecord *);
+	struct _CamelMIRecord * (*message_info_to_db) (CamelFolderSummary *, CamelMessageInfo *);
+	CamelMessageContentInfo * (*content_info_from_db) (CamelFolderSummary *, struct _CamelMIRecord *);
+	int (*content_info_to_db) (CamelFolderSummary *, CamelMessageContentInfo *, struct _CamelMIRecord *);
 	
 	/* create/save/load an individual message info */
 	CamelMessageInfo * (*message_info_new_from_header)(CamelFolderSummary *, struct _camel_header_raw *);

Modified: branches/gnome-2-24/camel/camel-folder.c
==============================================================================
--- branches/gnome-2-24/camel/camel-folder.c	(original)
+++ branches/gnome-2-24/camel/camel-folder.c	Tue Oct 14 05:43:10 2008
@@ -33,6 +33,7 @@
 
 #include <libedataserver/e-memory.h>
 
+#include "camel-db.h"
 #include "camel-debug.h"
 #include "camel-exception.h"
 #include "camel-filter-driver.h"

Modified: branches/gnome-2-24/camel/camel-store.c
==============================================================================
--- branches/gnome-2-24/camel/camel-store.c	(original)
+++ branches/gnome-2-24/camel/camel-store.c	Tue Oct 14 05:43:10 2008
@@ -34,6 +34,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "camel-db.h"
 #include "camel-debug.h"
 #include "camel-exception.h"
 #include "camel-folder.h"

Modified: branches/gnome-2-24/camel/camel-store.h
==============================================================================
--- branches/gnome-2-24/camel/camel-store.h	(original)
+++ branches/gnome-2-24/camel/camel-store.h	Tue Oct 14 05:43:10 2008
@@ -32,7 +32,6 @@
 
 #include <camel/camel-object.h>
 #include <camel/camel-service.h>
-#include <camel/camel-db.h>
 
 G_BEGIN_DECLS
 
@@ -117,13 +116,15 @@
 #define CAMEL_STORE_VJUNK		(1 << 3)
 #define CAMEL_STORE_PROXY		(1 << 4)
 
+struct _CamelDB;
+
 struct _CamelStore {
 	CamelService parent_object;
 	struct _CamelStorePrivate *priv;
 	
 	CamelObjectBag *folders;
-	CamelDB *cdb_r;
-	CamelDB *cdb_w;
+	struct _CamelDB *cdb_r;
+	struct _CamelDB *cdb_w;
 
 	guint32 flags;
 	guint32 mode;

Modified: branches/gnome-2-24/camel/camel-vee-folder.c
==============================================================================
--- branches/gnome-2-24/camel/camel-vee-folder.c	(original)
+++ branches/gnome-2-24/camel/camel-vee-folder.c	Tue Oct 14 05:43:10 2008
@@ -33,6 +33,7 @@
 #include <libedataserver/e-memory.h>
 #endif
 
+#include "camel-db.h"
 #include "camel-debug.h"
 #include "camel-exception.h"
 #include "camel-folder-search.h"

Modified: branches/gnome-2-24/camel/camel-vee-summary.c
==============================================================================
--- branches/gnome-2-24/camel/camel-vee-summary.c	(original)
+++ branches/gnome-2-24/camel/camel-vee-summary.c	Tue Oct 14 05:43:10 2008
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
+#include "camel-db.h"
 #include "camel-folder.h"
 #include "camel-store.h"
 #include "camel-vee-summary.h"

Modified: branches/gnome-2-24/camel/camel-vtrash-folder.c
==============================================================================
--- branches/gnome-2-24/camel/camel-vtrash-folder.c	(original)
+++ branches/gnome-2-24/camel/camel-vtrash-folder.c	Tue Oct 14 05:43:10 2008
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "camel-db.h"
 #include "camel-exception.h"
 #include "camel-mime-message.h"
 #include "camel-private.h"

Modified: branches/gnome-2-24/camel/providers/groupwise/camel-groupwise-summary.c
==============================================================================
--- branches/gnome-2-24/camel/providers/groupwise/camel-groupwise-summary.c	(original)
+++ branches/gnome-2-24/camel/providers/groupwise/camel-groupwise-summary.c	Tue Oct 14 05:43:10 2008
@@ -33,6 +33,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
+#include "camel-db.h"
 #include "camel-data-cache.h"
 #include "camel-file-utils.h"
 #include "camel-folder.h"

Modified: branches/gnome-2-24/camel/providers/imap/camel-imap-folder.c
==============================================================================
--- branches/gnome-2-24/camel/providers/imap/camel-imap-folder.c	(original)
+++ branches/gnome-2-24/camel/providers/imap/camel-imap-folder.c	Tue Oct 14 05:43:10 2008
@@ -39,6 +39,7 @@
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-time-utils.h>
 
+#include "camel-db.h"
 #include "camel-data-wrapper.h"
 #include "camel-debug.h"
 #include "camel-imap-journal.h"

Modified: branches/gnome-2-24/camel/providers/imap/camel-imap-store.c
==============================================================================
--- branches/gnome-2-24/camel/providers/imap/camel-imap-store.c	(original)
+++ branches/gnome-2-24/camel/providers/imap/camel-imap-store.c	Tue Oct 14 05:43:10 2008
@@ -36,6 +36,7 @@
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 
+#include "camel/camel-db.h"
 #include "camel/camel-debug.h"
 #include "camel/camel-exception.h"
 #include "camel/camel-file-utils.h"

Modified: branches/gnome-2-24/camel/providers/imap/camel-imap-summary.c
==============================================================================
--- branches/gnome-2-24/camel/providers/imap/camel-imap-summary.c	(original)
+++ branches/gnome-2-24/camel/providers/imap/camel-imap-summary.c	Tue Oct 14 05:43:10 2008
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
+#include "camel-db.h"
 #include "camel-folder.h"
 #include "camel-file-utils.h"
 #include "camel-string-utils.h"

Modified: branches/gnome-2-24/camel/providers/local/camel-local-summary.c
==============================================================================
--- branches/gnome-2-24/camel/providers/local/camel-local-summary.c	(original)
+++ branches/gnome-2-24/camel/providers/local/camel-local-summary.c	Tue Oct 14 05:43:10 2008
@@ -34,6 +34,7 @@
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 
+#include "camel-db.h"
 #include "camel-file-utils.h"
 #include "camel-mime-message.h"
 #include "camel-stream-null.h"

Modified: branches/gnome-2-24/camel/providers/local/camel-maildir-summary.c
==============================================================================
--- branches/gnome-2-24/camel/providers/local/camel-maildir-summary.c	(original)
+++ branches/gnome-2-24/camel/providers/local/camel-maildir-summary.c	Tue Oct 14 05:43:10 2008
@@ -38,6 +38,7 @@
 
 #include <libedataserver/e-memory.h>
 
+#include "camel-db.h"
 #include "camel-mime-message.h"
 #include "camel-operation.h"
 #include "camel-private.h"

Modified: branches/gnome-2-24/camel/providers/local/camel-mbox-summary.c
==============================================================================
--- branches/gnome-2-24/camel/providers/local/camel-mbox-summary.c	(original)
+++ branches/gnome-2-24/camel/providers/local/camel-mbox-summary.c	Tue Oct 14 05:43:10 2008
@@ -36,6 +36,7 @@
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 
+#include "camel-db.h"
 #include "camel-file-utils.h"
 #include "camel-mime-message.h"
 #include "camel-operation.h"

Modified: branches/gnome-2-24/camel/providers/local/camel-mh-summary.c
==============================================================================
--- branches/gnome-2-24/camel/providers/local/camel-mh-summary.c	(original)
+++ branches/gnome-2-24/camel/providers/local/camel-mh-summary.c	Tue Oct 14 05:43:10 2008
@@ -34,6 +34,7 @@
 
 #include <glib/gi18n-lib.h>
 
+#include "camel-db.h"
 #include "camel-store.h"
 #include "camel-mime-message.h"
 #include "camel-private.h"

Modified: branches/gnome-2-24/camel/providers/local/camel-spool-summary.c
==============================================================================
--- branches/gnome-2-24/camel/providers/local/camel-spool-summary.c	(original)
+++ branches/gnome-2-24/camel/providers/local/camel-spool-summary.c	Tue Oct 14 05:43:10 2008
@@ -34,6 +34,7 @@
 
 #include <glib/gi18n-lib.h>
 
+#include "camel-db.h"
 #include "camel-file-utils.h"
 #include "camel-mime-message.h"
 #include "camel-operation.h"

Modified: branches/gnome-2-24/camel/providers/nntp/camel-nntp-summary.c
==============================================================================
--- branches/gnome-2-24/camel/providers/nntp/camel-nntp-summary.c	(original)
+++ branches/gnome-2-24/camel/providers/nntp/camel-nntp-summary.c	Tue Oct 14 05:43:10 2008
@@ -33,6 +33,7 @@
 #include <glib/gi18n-lib.h>
 
 #include "camel/camel-data-cache.h"
+#include "camel/camel-db.h"
 #include "camel/camel-debug.h"
 #include "camel/camel-file-utils.h"
 #include "camel/camel-mime-message.h"