evolution-data-server r9255 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Mon Aug  4 07:09:53 2008
New Revision: 9255
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9255&view=rev

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

* camel-folder-search.c: (camel_folder_search_search): Fix while
moving to offline.
* camel-search-sql.c: (camel_sexp_to_sql):




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

Modified: trunk/camel/camel-folder-search.c
==============================================================================
--- trunk/camel/camel-folder-search.c	(original)
+++ trunk/camel/camel-folder-search.c	Mon Aug  4 07:09:53 2008
@@ -484,7 +484,7 @@
 		d(printf ("sexp is : [%s]\n", expr));
 		sql_query = camel_sexp_to_sql (expr);
 		tmp1 = camel_db_sqlize_string(search->folder->full_name);
-		tmp = g_strdup_printf ("SELECT uid FROM %s WHERE %s", tmp1,  sql_query);
+		tmp = g_strdup_printf ("SELECT uid FROM %s %s %s", tmp1, sql_query ? "WHERE":"", sql_query?sql_query:"");
 		camel_db_free_sqlized_string (tmp1);
 		g_free (sql_query);
 		d(printf("Equivalent sql %s\n", tmp));

Modified: trunk/camel/camel-search-sql.c
==============================================================================
--- trunk/camel/camel-search-sql.c	(original)
+++ trunk/camel/camel-search-sql.c	Mon Aug  4 07:09:53 2008
@@ -229,6 +229,9 @@
 	
 	d(printf("len = %d\n", strlen (txt)));
 	
+	if (!txt || !*txt)
+		return NULL;
+
 	g_scanner_input_text (scanner, txt, strlen(txt));
 	while (!g_scanner_eof (scanner)) {
 		Node *mnode;