2007-08-27 Murray Cumming <murrayc@murrayc.com>

* src/modest-search.c: Added check_and_wait_for_account_is_online(),
which checks every second, 10 times, to wait until the account is online
so that we can use it, if the account is in the process of going online.
(modest_search_all_accounts): Use check_and_wait_for_account_is_online()
so that searching works even when the application was not yet started before.
This fixes projects.maemo.org bug NB#63784, at least in scratchbox.

pmo-trunk-r3085

diff --git a/ChangeLog b/ChangeLog
index acb6b92..e326753 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,10 @@
+2007-08-27  Murray Cumming,,,  <murrayc@murrayc-desktop>
+
+       reviewed by: <delete if not using a buddy>
+
+       * src/dbus_api/modest-dbus-callbacks.c:
+       * src/modest-search.c: (on_timeout_check_account_is_online),
+       (check_and_wait_for_account_is_online),
+       (modest_search_all_accounts):
+
 * please check the svn log instead

diff --git a/ChangeLog2 b/ChangeLog2
index b163043..2eca938 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,12 @@
+2007-08-27  Murray Cumming  <murrayc@murrayc.com>
+
+       * src/modest-search.c: Added check_and_wait_for_account_is_online(), 
+       which checks every second, 10 times, to wait until the account is online 
+       so that we can use it, if the account is in the process of going online.
+       (modest_search_all_accounts): Use check_and_wait_for_account_is_online() 
+       so that searching works even when the application was not yet started before.
+       This fixes projects.maemo.org bug NB#63784, at least in scratchbox.
+
 2007-08-24  Armin Burgmeier  <armin@openismus.com>
 
        * src/modest-widget-memory.c: Always show the default account when the

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index 9b3837a..c3bf638 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -207,7 +207,6 @@ check_and_offer_account_creation()
        return result;
 }
 
-
 static gboolean
 on_idle_mail_to(gpointer user_data)
 {

diff --git a/src/modest-search.c b/src/modest-search.c
index 6e624d3..984445c 100644 (file)
--- a/src/modest-search.c
+++ b/src/modest-search.c
@@ -65,6 +65,86 @@ g_strdup_or_null (const gchar *str)
        return string;
 }
 
+typedef struct
+{
+       GMainLoop* loop;
+       TnyAccount *account;
+       gboolean is_online;
+       gint count_tries;
+} UtilIdleData;
+
+#define NUMBER_OF_TRIES = 10; /* Try approx every second, ten times. */
+
+static gboolean 
+on_timeout_check_account_is_online(gpointer user_data)
+{
+       printf ("DEBUG: %s:\n", __FUNCTION__);
+       UtilIdleData *data = (UtilIdleData*)user_data;
+       
+       gboolean stop_trying = FALSE;
+       if (data && data->account && 
+               (tny_account_get_connection_status (data->account) == TNY_CONNECTION_STATUS_CONNECTED) )
+       {
+               data->is_online = TRUE;
+               
+               stop_trying = TRUE;
+       }
+       else {
+               /* Give up if we have tried too many times: */
+               if (data->count_tries >= NUMBER_OF_TRIES)
+               {
+                       stop_trying = TRUE;
+               }
+               else {
+                       /* Wait for another timeout: */
+                       ++(data->count_tries);
+               }
+       }
+       
+       if (stop_trying) {
+               /* Allow the function that requested this idle callback to continue: */
+               if (data->loop)
+                       g_main_loop_quit (data->loop);
+               
+               return FALSE; /* Don't call this again. */
+       } else {
+               return TRUE; /* Call this timeout callback again. */
+       }
+}
+
+/* Return TRUE immediately if the account is already online,
+ * otherwise check every second for NUMBER_OF_TRIES seconds and return TRUE as 
+ * soon as the account is online, or FALSE if the account does 
+ * not become online in the NUMBER_OF_TRIES seconds.
+ * This is useful when the D-Bus method was run immediately after 
+ * the application was started (when using D-Bus activation), 
+ * because the account usually takes a short time to go online.
+ */
+static gboolean
+check_and_wait_for_account_is_online(TnyAccount *account)
+{
+       if (tny_account_get_connection_status (account) == TNY_CONNECTION_STATUS_CONNECTED)
+               return TRUE;
+               
+       /* This blocks on the result: */
+       UtilIdleData *data = g_slice_new0 (UtilIdleData);
+       data->is_online = FALSE;
+               
+       GMainContext *context = NULL; /* g_main_context_new (); */
+       data->loop = g_main_loop_new (context, FALSE /* not running */);
+
+       g_timeout_add (1000, &on_timeout_check_account_is_online, data);
+
+       /* This main loop will run until the idle handler has stopped it: */
+       g_main_loop_run (data->loop);
+
+       g_main_loop_unref (data->loop);
+       /* g_main_context_unref (context); */
+
+       g_slice_free (UtilIdleData, data);
+       
+       return data->is_online; 
+}
 
 static GList*
 add_hit (GList *list, TnyHeader *header, TnyFolder *folder)
@@ -588,13 +668,20 @@ modest_search_all_accounts (ModestSearch *search)
                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);
+                        
+                       /* Give the account time to go online if necessary, 
+                        * for instance if this is immediately after startup,
+                        * after D-Bus activation: */
+                       if (check_and_wait_for_account_is_online (account)) {
+                               /* Search: */
+                               res = modest_search_account (account, search);
+                               
+                               if (res != NULL) {      
+                                       if (hits == NULL) {
+                                               hits = res;
+                                       } else {
+                                               hits = g_list_concat (hits, res);
+                                       }
                                }
                        }