evolution-data-server r9292 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Thu Aug  7 04:45:20 2008
New Revision: 9292
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9292&view=rev

Log:
2008-08-07  Srinivasa Ragavan  <sragavan novell com>

	* camel/camel-db.c: Fix return values.
	* camel/camel-folder-search.c: Suppress No such table exception.


Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-db.c
   trunk/camel/camel-folder-search.c

Modified: trunk/camel/camel-db.c
==============================================================================
--- trunk/camel/camel-db.c	(original)
+++ trunk/camel/camel-db.c	Thu Aug  7 04:45:20 2008
@@ -415,7 +415,7 @@
 	int ret = -1;
 
 	if (!cdb)
-		return TRUE;
+		return ret;
 	
 	d(g_print ("\n%s:\n%s \n", __FUNCTION__, stmt));
 	g_mutex_lock (cdb->lock);

Modified: trunk/camel/camel-folder-search.c
==============================================================================
--- trunk/camel/camel-folder-search.c	(original)
+++ trunk/camel/camel-folder-search.c	Thu Aug  7 04:45:20 2008
@@ -493,6 +493,13 @@
 		matches = g_ptr_array_new();
 		cdb = (CamelDB *) (search->folder->cdb);
 		camel_db_select (cdb, tmp, (CamelDBSelectCB) read_uid_callback, matches, ex);
+		if (camel_exception_is_set(ex)) {
+			const char *exception = camel_exception_get_description (ex);
+			if (strncmp(exception, "no such table", 13) == 0) {
+				g_warning ("Error during searching %s: %s\n", tmp, exception);
+				camel_exception_clear (ex); /* Suppress no such table */
+			}
+		}
 		g_free (tmp);
 
 	}