* it makes sense not to allow '&' and '#' in new folder names,

[modest] / src / modest-search.c

diff --git a/src/modest-search.c b/src/modest-search.c
index 94a5c3e..761598c 100644 (file)
--- a/src/modest-search.c
+++ b/src/modest-search.c
@@ -43,15 +43,17 @@
 #include <tny-list.h>
 #include <tny-iterator.h>
 #include <tny-simple-list.h>
-
-#include <libmodest-dbus-client/libmodest-dbus-client.h>
+#include <tny-camel-imap-store-account.h>
+#include <tny-camel-pop-store-account.h>
 
 #include "modest-text-utils.h"
 #include "modest-account-mgr.h"
 #include "modest-tny-account-store.h"
 #include "modest-tny-account.h"
+#include "modest-tny-folder.h"
 #include "modest-search.h"
 #include "modest-runtime.h"
+#include "modest-platform.h"
 
 static gchar *
 g_strdup_or_null (const gchar *str)
@@ -65,11 +67,10 @@ g_strdup_or_null (const gchar *str)
        return string;
 }
 
-
 static GList*
 add_hit (GList *list, TnyHeader *header, TnyFolder *folder)
 {
-       ModestSearchHit *hit;
+       ModestSearchResultHit *hit;
        TnyHeaderFlags   flags;
        char            *furl;
        char            *msg_url;
@@ -77,7 +78,7 @@ add_hit (GList *list, TnyHeader *header, TnyFolder *folder)
        const char      *subject;
        const char      *sender;
 
-       hit = g_slice_new0 (ModestSearchHit);
+       hit = g_slice_new0 (ModestSearchResultHit);
 
        furl = tny_folder_get_url_string (folder);
        printf ("DEBUG: %s: folder URL=%s\n", __FUNCTION__, furl);
@@ -109,7 +110,7 @@ add_hit (GList *list, TnyHeader *header, TnyFolder *folder)
        hit->msize = tny_header_get_message_size (header);
        hit->has_attachment = flags & TNY_HEADER_FLAG_ATTACHMENTS;
        hit->is_unread = ! (flags & TNY_HEADER_FLAG_SEEN);
-       hit->timestamp = tny_header_get_date_received (header);
+       hit->timestamp = MIN (tny_header_get_date_received (header), tny_header_get_date_sent (header));
        
        return g_list_prepend (list, hit);
 }
@@ -295,7 +296,7 @@ search_mime_part_strcmp (TnyMimePart *part, ModestSearch *search)
                                                        buffer,
                                                        TRUE);
 
-               if (found) {
+               if ((found)||(nread == 0)) {
                        break;
                }
 
@@ -386,8 +387,15 @@ 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 && strlen (search->folder) && (strcmp (tny_folder_get_id (folder), search->folder) != 0))
-               return NULL;
+       if (search->folder && strlen (search->folder)) {
+               if (!strcmp (search->folder, "outbox")) {
+                       if (modest_tny_folder_guess_folder_type (folder) != TNY_FOLDER_TYPE_OUTBOX) {
+                               return NULL;
+                       }
+               } else if (strcmp (tny_folder_get_id (folder), search->folder) != 0) {
+                       return NULL;
+               }
+       }
        
        GList *retval = NULL;
        TnyIterator *iter = NULL;
@@ -420,15 +428,19 @@ 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))
+                       if (!(t <= search->end_date))
                                goto go_next;
 
                if (search->flags & MODEST_SEARCH_AFTER)
-                       if (!(t >= search->after))
+                       if (!(t >= search->start_date))
                                goto go_next;
 
                if (search->flags & MODEST_SEARCH_SIZE)
@@ -488,6 +500,7 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search)
                                        retval = add_hit (retval, cur, folder);
                                }
                        }
+                       
                        if (msg)
                                g_object_unref (msg);
                }
@@ -583,6 +596,13 @@ modest_search_all_accounts (ModestSearch *search)
                if (account) {
                        /* g_debug ("DEBUG: %s: Searching account %s",
                         __FUNCTION__, tny_account_get_name (account)); */
+                        
+                       /* Give the account time to go online if necessary, 
+                        * for instance if this is immediately after startup,
+                        * after D-Bus activation: */
+                       modest_platform_check_and_wait_for_account_is_online (account);
+                       
+                       /* Search: */
                        res = modest_search_account (account, search);
                        
                        if (res != NULL) {