Fix while moving to offline.

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):

svn path=/trunk/; revision=9255

diff --git a/camel/ChangeLog b/camel/ChangeLog
index d31f57c..28b7808 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,11 @@
 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):
+
+2008-08-04  Srinivasa Ragavan  <sragavan@novell.com>
+
        * camel/camel-string-utils.c: Disable debug crashers.
 
 2008-08-03  Srinivasa Ragavan  <sragavan@novell.com>

diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 03f621c..71618b9 100644 (file)
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -484,7 +484,7 @@ camel_folder_search_search(CamelFolderSearch *search, const char *expr, GPtrArra
                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));

diff --git a/camel/camel-search-sql.c b/camel/camel-search-sql.c
index bac08f1..932f3d3 100644 (file)
--- a/camel/camel-search-sql.c
+++ b/camel/camel-search-sql.c
@@ -229,6 +229,9 @@ camel_sexp_to_sql (const char *txt)
        
        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;