2007-06-25 Murray Cumming <murrayc@murrayc.com>

* src/modest-search.c: (modest_search_folder): Ignore a seach folder
        that is an empty string. D-Bus seems to give us these instead of NULL.

pmo-trunk-r2392

diff --git a/ChangeLog b/ChangeLog
index acb6b92..28bd529 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,7 @@
+2007-06-25  Murray Cumming,,,  <murrayc@murrayc-desktop>
+
+       reviewed by: <delete if not using a buddy>
+
+       * src/modest-search.c: (modest_search_folder):
+
 * please check the svn log instead

diff --git a/ChangeLog2 b/ChangeLog2
index 60bdbf3..eba5987 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,8 @@
+2007-06-25  Murray Cumming  <murrayc@murrayc.com>
+
+       * src/modest-search.c: (modest_search_folder): Ignore a seach folder 
+       that is an empty string. D-Bus seems to give us these instead of NULL.
+
 2007-06-25  Johannes Schmid <johannes.schmid@openismus.com>
 
        * src/dbus_api/modest-dbus-callbacks.c:

diff --git a/src/modest-search.c b/src/modest-search.c
index 45fc996..6fa0e6f 100644 (file)
--- a/src/modest-search.c
+++ b/src/modest-search.c
@@ -384,9 +384,9 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search)
        /* Check that we should be searching this folder. */
        /* Note that we don't try to search sub-folders. 
         * Maybe we should, but that should be specified. */
-       if (search->folder && (strcmp (tny_folder_get_id (folder), search->folder) != 0))
+       if (search->folder && strlen (search->folder) && (strcmp (tny_folder_get_id (folder), search->folder) != 0))
                return NULL;
-               
+       
        GList *retval = NULL;
        TnyIterator *iter = NULL;
        TnyList *list = NULL;