evolution-data-server r8892 - branches/camel-db-summary/camel

[sragavan svn gnome org]

Author: sragavan
Date: Mon Jun  2 06:26:26 2008
New Revision: 8892
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8892&view=rev

Log:
Add camel db logging and fix a crash.


Modified:
   branches/camel-db-summary/camel/camel-db.c
   branches/camel-db-summary/camel/camel-folder-summary.c

Modified: branches/camel-db-summary/camel/camel-db.c
==============================================================================
--- branches/camel-db-summary/camel/camel-db.c	(original)
+++ branches/camel-db-summary/camel/camel-db.c	Mon Jun  2 06:26:26 2008
@@ -10,7 +10,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#define d(x) 
+#define d(x) x
 
 static int 
 cdb_sql_exec (sqlite3 *db, const char* stmt, CamelException *ex) 
@@ -19,7 +19,7 @@
   	int   ret;
 
   	ret = sqlite3_exec(db, stmt, 0, 0, &errmsg);
-
+	d(g_print("%s\n", stmt));
   	if (ret != SQLITE_OK) {
     		d(g_print ("Error in SQL EXEC statement: %s [%s].\n", stmt, errmsg));
 		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _(errmsg));

Modified: branches/camel-db-summary/camel/camel-folder-summary.c
==============================================================================
--- branches/camel-db-summary/camel/camel-folder-summary.c	(original)
+++ branches/camel-db-summary/camel/camel-folder-summary.c	Mon Jun  2 06:26:26 2008
@@ -2229,16 +2229,18 @@
 
 	/* Extract User flags/labels */
 	part = record->labels;
-	label = part;
-	for (i=0;part[i];i++) {
-
-		if (part[i] == ' ') {
-			part[i] = 0;
-			camel_flag_set(&mi->user_flags, label, TRUE);
-			label = &(part[i+1]);
+	if (part) {
+		label = part;
+		for (i=0;part[i];i++) {
+
+			if (part[i] == ' ') {
+				part[i] = 0;
+				camel_flag_set(&mi->user_flags, label, TRUE);
+				label = &(part[i+1]);
+			}
 		}
+		camel_flag_set(&mi->user_flags, label, TRUE);
 	}
-	camel_flag_set(&mi->user_flags, label, TRUE);
 
 	/* Extract User tags */
 	part = record->usertags;