* moved the tny alert dialog stuff to modest-platform

[modest] / src / modest-search.c

diff --git a/src/modest-search.c b/src/modest-search.c
index 3ed4ed6..477638f 100644 (file)
--- a/src/modest-search.c
+++ b/src/modest-search.c
@@ -43,6 +43,8 @@
 #include <tny-list.h>
 #include <tny-iterator.h>
 #include <tny-simple-list.h>
+#include <tny-camel-imap-store-account.h>
+#include <tny-camel-pop-store-account.h>
 
 #include <libmodest-dbus-client/libmodest-dbus-client.h>
 
@@ -52,6 +54,7 @@
 #include "modest-tny-account.h"
 #include "modest-search.h"
 #include "modest-runtime.h"
+#include "modest-platform.h"
 
 static gchar *
 g_strdup_or_null (const gchar *str)
@@ -65,7 +68,6 @@ g_strdup_or_null (const gchar *str)
        return string;
 }
 
-
 static GList*
 add_hit (GList *list, TnyHeader *header, TnyFolder *folder)
 {
@@ -428,11 +430,11 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search)
                        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)
@@ -588,6 +590,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) {