2007-08-04 Johannes Schmid <johannes.schmid@openismus.com>

[modest] / src / modest-search.c

diff --git a/src/modest-search.c b/src/modest-search.c
index ab30a4c..3ed4ed6 100644 (file)
--- a/src/modest-search.c
+++ b/src/modest-search.c
@@ -356,10 +356,12 @@ static gboolean search_mime_part_and_child_parts (TnyMimePart *part, ModestSearc
        TnyIterator *piter = tny_list_create_iterator (child_parts);
        while (!found && !tny_iterator_is_done (piter)) {
                TnyMimePart *pcur = (TnyMimePart *) tny_iterator_get_current (piter);
+               if (pcur) {
+                       found = search_mime_part_and_child_parts (pcur, search);
 
-               found = search_mime_part_and_child_parts (pcur, search);
+                       g_object_unref (pcur);
+               }
 
-               g_object_unref (pcur);
                tny_iterator_next (piter);
        }
 
@@ -418,9 +420,13 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search)
 
        while (!tny_iterator_is_done (iter)) {
                TnyHeader *cur = (TnyHeader *) tny_iterator_get_current (iter);
-               time_t t = tny_header_get_date_sent (cur);
+               const time_t t = tny_header_get_date_sent (cur);
                gboolean found = FALSE;
                
+               /* Ignore deleted (not yet expunged) emails: */
+               if (tny_header_get_flags(cur) & TNY_HEADER_FLAG_DELETED)
+                       goto go_next;
+                       
                if (search->flags & MODEST_SEARCH_BEFORE)
                        if (!(t <= search->before))
                                goto go_next;
@@ -478,16 +484,17 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search)
                                if (msg) {
                                        g_object_unref (msg);
                                }
-                       }       
-
-                       found = search_mime_part_and_child_parts (TNY_MIME_PART (msg), 
-                               search);
-                       if (found) {
-                               retval = add_hit (retval, cur, folder);
+                       } else {        
+                       
+                               found = search_mime_part_and_child_parts (TNY_MIME_PART (msg), 
+                                                                         search);
+                               if (found) {
+                                       retval = add_hit (retval, cur, folder);
+                               }
                        }
                        
-                       g_object_unref (msg);
-
+                       if (msg)
+                               g_object_unref (msg);
                }
 
 go_next:
@@ -524,24 +531,27 @@ modest_search_account (TnyAccount *account, ModestSearch *search)
 
        iter = tny_list_create_iterator (folders);
        while (!tny_iterator_is_done (iter)) {
-               TnyFolder *folder;
-               GList     *res;
+               TnyFolder *folder = NULL;
+               GList     *res = NULL;
 
                folder = TNY_FOLDER (tny_iterator_get_current (iter));
-               /* g_debug ("DEBUG: %s: searching folder %s.", 
-                       __FUNCTION__, tny_folder_get_name (folder)); */
+               if (folder) {
+                       /* g_debug ("DEBUG: %s: searching folder %s.", 
+                               __FUNCTION__, tny_folder_get_name (folder)); */
                
-               res = modest_search_folder (folder, search);
+                       res = modest_search_folder (folder, search);
 
-               if (res != NULL) {
-                       if (hits == NULL) {
-                               hits = res;
-                       } else {
-                               hits = g_list_concat (hits, res);
+                       if (res != NULL) {
+                               if (hits == NULL) {
+                                       hits = res;
+                               } else {
+                                       hits = g_list_concat (hits, res);
+                               }
                        }
+
+                       g_object_unref (folder);
                }
 
-               g_object_unref (folder);
                tny_iterator_next (iter);
        }
 
@@ -571,25 +581,26 @@ modest_search_all_accounts (ModestSearch *search)
 
        iter = tny_list_create_iterator (accounts);
        while (!tny_iterator_is_done (iter)) {
-               TnyAccount *account;
-               GList      *res;
+               TnyAccount *account = NULL;
+               GList      *res = NULL;
 
                account = TNY_ACCOUNT (tny_iterator_get_current (iter));
-
-               /* g_debug ("DEBUG: %s: Searching account %s",
-                        __FUNCTION__, tny_account_get_name (account)); */
-               res = modest_search_account (account, search);
-               
-               if (res != NULL) {
-
-                       if (hits == NULL) {
-                               hits = res;
-                       } else {
-                               hits = g_list_concat (hits, res);
+               if (account) {
+                       /* g_debug ("DEBUG: %s: Searching account %s",
+                        __FUNCTION__, tny_account_get_name (account)); */
+                       res = modest_search_account (account, search);
+                       
+                       if (res != NULL) {      
+                               if (hits == NULL) {
+                                       hits = res;
+                               } else {
+                                       hits = g_list_concat (hits, res);
+                               }
                        }
+                       
+                       g_object_unref (account);
                }
 
-               g_object_unref (account);
                tny_iterator_next (iter);
        }