evolution-data-server r8748 - in trunk: . camel camel/db-scrap-tools camel/providers docs/reference/camel/tmpl

[psankar svn gnome org]

Author: psankar
Date: Tue May  6 11:27:30 2008
New Revision: 8748
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8748&view=rev

Log:
Bad git-svn usage. Reverted.


Removed:
   trunk/camel/camel-db.c
   trunk/camel/camel-db.h
   trunk/camel/db-scrap-tools/db.c
Modified:
   trunk/ChangeLog
   trunk/camel/Makefile.am
   trunk/camel/camel-store.c
   trunk/camel/camel-store.h
   trunk/camel/providers/Makefile.am
   trunk/docs/reference/camel/tmpl/camel-store.sgml
   trunk/docs/reference/camel/tmpl/camel-vtrash-folder.sgml

Modified: trunk/camel/Makefile.am
==============================================================================
--- trunk/camel/Makefile.am	(original)
+++ trunk/camel/Makefile.am	Tue May  6 11:27:30 2008
@@ -157,7 +157,6 @@
 	camel-charset-map.c			\
 	camel-data-cache.c			\
 	camel-data-wrapper.c			\
-	camel-db.c				\
 	camel-debug.c				\
 	camel-exception.c			\
 	camel-file-utils.c			\
@@ -225,7 +224,6 @@
 	camel-charset-map.h			\
 	camel-data-cache.h			\
 	camel-data-wrapper.h			\
-	camel-db.h				\
 	camel-debug.h				\
 	camel-exception-list.def		\
 	camel-exception.h			\
@@ -293,8 +291,7 @@
 	$(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
 	$(CAMEL_LIBS)							\
 	$(SOCKET_LIBS)							\
-	$(REGEX_LIBS)							\
-	-lsqlite3
+	$(REGEX_LIBS)
 
 
 camel_lock_helper_1_2_SOURCES = 		\

Modified: trunk/camel/camel-store.c
==============================================================================
--- trunk/camel/camel-store.c	(original)
+++ trunk/camel/camel-store.c	Tue May  6 11:27:30 2008
@@ -42,7 +42,7 @@
 #include "camel-store.h"
 #include "camel-vtrash-folder.h"
 
-#define d(x) (x)
+#define d(x)
 #define w(x)
 
 static CamelServiceClass *parent_class = NULL;
@@ -145,7 +145,6 @@
 	store->mode = CAMEL_STORE_READ|CAMEL_STORE_WRITE;
 
 	store->priv = g_malloc0 (sizeof (*store->priv));
-	store->cdb = NULL;
 	g_static_rec_mutex_init (&store->priv->folder_lock);
 }
 
@@ -157,9 +156,6 @@
 	if (store->folders)
 		camel_object_bag_destroy(store->folders);
 
-	if (store->cdb)
-		camel_db_close (store->cdb);
-
 	g_static_rec_mutex_free (&store->priv->folder_lock);
 
 	g_free (store->priv);
@@ -204,9 +200,6 @@
 	   CamelException *ex)
 {
 	CamelStore *store = CAMEL_STORE(service);
-	char *path, *service_path, **summary_path;
-
-	const char *CREATE_STORE_TABLE_QRY = "CREATE TABLE folders (folder TEXT PRIMARY KEY, version INTEGER, lflags INTEGER, nextuid INTEGER, time INTEGER, savedcount INTEGER, unread INTEGER, deleted INTEGER, junk INTEGER, bdata TEXT)";
 
 	parent_class->construct(service, session, provider, url, ex);
 	if (camel_exception_is_set (ex))
@@ -214,35 +207,6 @@
 
 	if (camel_url_get_param(url, "filter"))
 		store->flags |= CAMEL_STORE_FILTER_INBOX;
-
-	d(printf ("store's construct function is called \n"));
-	//tmp = camel_session_get_storage_path (session, service, ex);
-	service_path = camel_service_get_path (service);
-	summary_path = g_strsplit (service_path, "/", 2);
-
-	path = g_strdup_printf ("/%s/%s", summary_path[1], CAMEL_STORE_SUMMARY_FILE_NAME);
-
-	d(printf ("Database path to be opened is : [%s] \n", path));
-
-	store->cdb = camel_db_open (path);
-	if (store->cdb) {
-		d(printf ("Store's database opened \n"));
-		/* If the tables aren't already there, create atleast the store's table*/
-		if (!camel_db_command (store->cdb, "select folder from folders")) {
-			if (!camel_db_command (store->cdb, CREATE_STORE_TABLE_QRY))
-				g_warning ("Unable to create store structing db");
-			else {
-				printf ("README: All these changes needs to be logged \n");
-				d(printf ("folders table created in the store's database.\n"));
-			}
-		}
-	} else {
-		d(printf ("Store's database cannot be opened \n"));
-		printf ("FIXME: This has to be passed via a CamelException \n");
-	}
-	g_free (service_path);
-	g_free (path);
-	g_strfreev (summary_path);
 }
 
 static CamelFolder *

Modified: trunk/camel/camel-store.h
==============================================================================
--- trunk/camel/camel-store.h	(original)
+++ trunk/camel/camel-store.h	Tue May  6 11:27:30 2008
@@ -33,8 +33,6 @@
 #include <camel/camel-object.h>
 #include <camel/camel-service.h>
 
-#include <camel/camel-db.h>
-
 G_BEGIN_DECLS
 
 enum {
@@ -126,8 +124,6 @@
 
 	guint32 flags;
 	guint32 mode;
-
-	CamelDB *cdb;
 };
 
 /* open mode for folder */

Modified: trunk/camel/providers/Makefile.am
==============================================================================
--- trunk/camel/providers/Makefile.am	(original)
+++ trunk/camel/providers/Makefile.am	Tue May  6 11:27:30 2008
@@ -17,8 +17,6 @@
 SENDMAIL_DIR=sendmail
 endif
 
-## SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise hula
-
-SUBDIRS = imap local
+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise hula
 
 

Modified: trunk/docs/reference/camel/tmpl/camel-store.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-store.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-store.sgml	Tue May  6 11:27:30 2008
@@ -27,7 +27,6 @@
 @folders: 
 @flags: 
 @mode: 
- cdb: 
 
 <!-- ##### STRUCT CamelFolderInfo ##### -->
 <para>

Modified: trunk/docs/reference/camel/tmpl/camel-vtrash-folder.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-vtrash-folder.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-vtrash-folder.sgml	Tue May  6 11:27:30 2008
@@ -37,7 +37,6 @@
 </para>
 
 @parent: 
- type: 
 @bit: 
 
 <!-- ##### ENUM camel_vtrash_folder_t ##### -->