* Migrated the do_send_receive to use connect_and_perform instead of connect_and_wait
authorSergio Villar Senin <svillar@igalia.com>
Fri, 9 Nov 2007 11:34:46 +0000 (11:34 +0000)
committerSergio Villar Senin <svillar@igalia.com>
Fri, 9 Nov 2007 11:34:46 +0000 (11:34 +0000)
pmo-trunk-r3681

src/maemo/modest-main-window.c
src/maemo/modest-platform.c
src/modest-mail-operation.c
src/modest-platform.h
src/modest-ui-actions.c
src/widgets/modest-header-view.c

index 58cb079..9fd1944 100644 (file)
@@ -2505,7 +2505,7 @@ on_updating_msg_list (ModestHeaderView *header_view,
        ModestMainWindowPrivate *priv = NULL;
 
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE (user_data);
-
+       
        /* Remove old timeout */
        if (priv->updating_banner_timeout > 0) {
                g_source_remove (priv->updating_banner_timeout);
index eddbaf2..8f38a5a 100644 (file)
@@ -1072,7 +1072,7 @@ modest_platform_connect_and_wait (GtkWindow *parent_window,
        /* Wait until the callback is executed */
        g_mutex_lock (data->mutex);
        if (!data->has_callback) {
-               data->wait_loop = g_main_loop_new (NULL, FALSE);
+               data->wait_loop = g_main_loop_new (g_main_context_new (), FALSE);
                gdk_threads_leave ();
                g_mutex_unlock (data->mutex);
                g_main_loop_run (data->wait_loop);
@@ -1685,8 +1685,6 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
        
        return response == GTK_RESPONSE_OK;
 }
-       
-
 
 gboolean
 modest_platform_run_alert_dialog (const gchar* prompt, 
@@ -1711,7 +1709,7 @@ modest_platform_run_alert_dialog (const gchar* prompt,
                 * so we know what buttons to show. */
                GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_win), 
                                                                              prompt));
-               modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
+               modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
                                             GTK_WINDOW (dialog));
                
                const int response = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -1725,3 +1723,270 @@ modest_platform_run_alert_dialog (const gchar* prompt,
        }
        return retval;
 }
+
+/***************/
+typedef struct {
+       GtkWindow *parent_window;
+       ModestConnectedPerformer callback;
+       TnyAccount *account;
+       gpointer user_data;
+       gchar *iap;
+       TnyDevice *device;
+} OnWentOnlineInfo;
+static void 
+on_went_online_info_free (OnWentOnlineInfo *info)
+{
+       /* And if we cleanup, we DO cleanup  :-)  */
+       
+       if (info->device)
+               g_object_unref (info->device);
+       if (info->iap)
+               g_free (info->iap);
+       if (info->parent_window)
+               g_object_unref (info->parent_window);
+       if (info->account)
+               g_object_unref (info->account);
+       
+       g_slice_free (OnWentOnlineInfo, info);
+       
+       /* We're done ... */
+       
+       return;
+}
+static void
+on_account_went_online (TnyCamelAccount *account, gboolean canceled, GError *err, gpointer user_data)
+{
+       OnWentOnlineInfo *info = (OnWentOnlineInfo *) user_data;
+       /* Now it's really time to callback to the caller. If going online didn't succeed,
+        * err will be set. We don't free it, Tinymail does that! If a cancel happened,
+        * canceled will be set. Etcetera etcetera. */
+       
+       if (info->callback) {
+               info->callback (canceled, err, info->parent_window, info->account, info->user_data);
+       }
+       
+       /* This is our last call, we must cleanup here if we didn't yet do that */
+       on_went_online_info_free (info);
+       
+       return;
+}
+static void
+on_conic_device_went_online (TnyMaemoConicDevice *device, const gchar* iap_id, gboolean canceled, GError *err, gpointer user_data)
+{
+       OnWentOnlineInfo *info = (OnWentOnlineInfo *) user_data;
+       info->iap = g_strdup (iap_id);
+       
+       if (canceled || err || !info->account) {
+       
+               /* If there's a problem or if there's no account (then that's it for us, we callback
+                * the caller's callback now. He'll have to handle err or canceled, of course.
+                * We are not really online, as the account is not really online here ... */    
+               
+               /* We'll use the err and the canceled of this cb. TnyMaemoConicDevice delivered us
+                * this info. We don't cleanup err, Tinymail does that! */
+               
+               if (info->callback) {
+                       
+                       /* info->account can be NULL here, this means that the user did not
+                        * provide a nice account instance. We'll assume that the user knows
+                        * what he's doing and is happy with just the device going online. 
+                        * 
+                        * We can't do magic, we don't know what account the user wants to
+                        * see going online. So just the device goes online, end of story */
+                       
+                       info->callback (canceled, err, info->parent_window, info->account, info->user_data);
+               }
+               
+       } else if (info->account) {
+               
+               /* If there's no problem and if we have an account, we'll put the account
+                * online too. When done, the callback of bringing the account online
+                * will callback the caller's callback. This is the most normal case. */
+               info->device = TNY_DEVICE (g_object_ref (device));
+               
+               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (info->account), TRUE,
+                                             on_account_went_online, info);
+               
+               /* The on_account_went_online cb frees up the info, go look if you
+                * don't believe me! (so we return here) */
+               
+               return;
+       }
+       
+       /* We cleanup if we are not bringing the account online too */
+       on_went_online_info_free (info);
+       return; 
+}
+       
+void 
+modest_platform_connect_and_perform (GtkWindow *parent_window, 
+                                    TnyAccount *account, ModestConnectedPerformer callback, gpointer user_data)
+{
+       gboolean device_online;
+       TnyDevice *device;
+       TnyConnectionStatus conn_status;
+       OnWentOnlineInfo *info;
+       
+       device = modest_runtime_get_device();
+       device_online = tny_device_is_online (device);
+
+       /* If there is no account check only the device status */
+       if (!account) {
+               
+               if (device_online) {
+                       /* We promise to instantly perform the callback, so ... */
+                       if (callback) {
+                               callback (FALSE, NULL, parent_window, account, user_data);
+                       }
+                       
+               } else {
+                       
+                       info = g_slice_new0 (OnWentOnlineInfo);
+                       
+                       info->iap = NULL;
+                       info->device = NULL;
+                       info->account = NULL;
+               
+                       if (parent_window)
+                               info->parent_window = (GtkWindow *) g_object_ref (parent_window);
+                       else
+                               info->parent_window = NULL;
+                       info->user_data = user_data;
+                       info->callback = callback;
+               
+                       tny_maemo_conic_device_connect_async (TNY_MAEMO_CONIC_DEVICE (device), NULL,
+                                                             on_conic_device_went_online, info);
+                       /* We'll cleanup in on_conic_device_went_online */
+               }
+               /* The other code has no more reason to run. This is all that we can do for the
+                * caller (he should have given us a nice and clean account instance!). We
+                * can't do magic, we don't know what account he intends to bring online. So
+                * we'll just bring the device online (and await his false bug report). */
+               
+               return;
+       }
+       
+       /* Return if the account is already connected */
+       
+       conn_status = tny_account_get_connection_status (account);
+       if (device_online && conn_status == TNY_CONNECTION_STATUS_CONNECTED) {
+               /* We promise to instantly perform the callback, so ... */
+               if (callback) {
+                       callback (FALSE, NULL, parent_window, account, user_data);
+               }
+               
+               return;
+       }
+       
+       /* Else, we are in a state that requires that we go online before we
+        * call the caller's callback. */
+       
+       info = g_slice_new0 (OnWentOnlineInfo);
+       
+       info->device = NULL;
+       info->iap = NULL;
+       info->account = TNY_ACCOUNT (g_object_ref (account));
+       
+       if (parent_window)
+               info->parent_window = (GtkWindow *) g_object_ref (parent_window);
+       else
+               info->parent_window = NULL;
+       
+       /* So we'll put the callback away for later ... */
+       
+       info->user_data = user_data;
+       info->callback = callback;
+       
+       if (!device_online) {
+               /* If also the device is offline, then we connect both the device 
+                * and the account */
+               
+               tny_maemo_conic_device_connect_async (TNY_MAEMO_CONIC_DEVICE (device), NULL,
+                                                     on_conic_device_went_online, info);
+               
+       } else {
+               
+               /* If the device is online, we'll just connect the account */
+               
+               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), TRUE, 
+                                             on_account_went_online, info);
+       }
+       /* The info gets freed by on_account_went_online or on_conic_device_went_online
+        * in both situations, go look if you don't believe me! */
+       
+       return;
+}
+void 
+modest_platform_connect_and_perform_if_network_account (GtkWindow *parent_window, 
+                                                       TnyAccount *account,
+                                                       ModestConnectedPerformer callback, 
+                                                       gpointer user_data)
+{
+       if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) {
+               if (!TNY_IS_CAMEL_POP_STORE_ACCOUNT (account) &&
+                   !TNY_IS_CAMEL_IMAP_STORE_ACCOUNT (account)) {
+                       
+                       /* This IS a local account like a maildir account, which does not require 
+                        * a connection. (original comment had a vague assumption in its language
+                        * usage. There's no assuming needed, this IS what it IS: a local account), */
+                       /* We promise to instantly perform the callback, so ... */
+                       if (callback) {
+                               callback (FALSE, NULL, parent_window, account, user_data);
+                       }
+                       
+                       return;
+               }
+       }
+       modest_platform_connect_and_perform (parent_window, account, callback, user_data);
+       return;
+}
+void
+modest_platform_connect_and_perform_if_network_folderstore (GtkWindow *parent_window, TnyFolderStore *folder_store, 
+                                                           ModestConnectedPerformer callback, gpointer user_data)
+{
+       if (!folder_store) {
+               /* We promise to instantly perform the callback, so ... */
+               if (callback) {
+                       callback (FALSE, NULL, parent_window, NULL, user_data);
+               }
+               return; 
+               
+               /* Original comment: Maybe it is something local. */
+               /* PVH's comment: maybe we should KNOW this in stead of assuming? */
+               
+       }
+       
+       if (TNY_IS_FOLDER (folder_store)) {
+               /* Get the folder's parent account: */
+               TnyAccount *account = tny_folder_get_account(TNY_FOLDER (folder_store));
+               if (account != NULL) {
+                       modest_platform_connect_and_perform_if_network_account (NULL, account, callback, user_data);
+                       g_object_unref (account);
+               }
+       } else if (TNY_IS_ACCOUNT (folder_store)) {
+               /* Use the folder store as an account: */
+               modest_platform_connect_and_perform_if_network_account (NULL, TNY_ACCOUNT (folder_store), callback, user_data);
+       }
+       return;
+}
index b3f97d4..56e7c3b 100644 (file)
@@ -2791,7 +2791,7 @@ on_refresh_folder (TnyFolder   *folder,
        }
 
        /* Free */
-       g_slice_free   (RefreshAsyncHelper, helper);
+       g_slice_free (RefreshAsyncHelper, helper);
 
        /* Notify about operation end */
        modest_mail_operation_notify_end (self);
index 7f0d597..745dd5f 100644 (file)
@@ -379,6 +379,70 @@ gboolean modest_platform_run_alert_dialog (const gchar* prompt, gboolean is_ques
  **/
 void modest_platform_remove_new_mail_notifications (void);
 
+/* ModestConnectedPerformer:
+ * @canceled: whether or not the user canceled
+ * @err: whether an error occured during connecting, or NULL of not
+ * @parent_window: the parent window or NULL
+ * @account: the account or NULL
+ * @user_data: your own user data
+ * 
+ * This is the callback for the modest_platform_connect_and_perform* functions
+ */
+typedef void (*ModestConnectedPerformer) (gboolean canceled, 
+                                         GError *err,
+                                         GtkWindow *parent_window, 
+                                         TnyAccount *account, 
+                                         gpointer user_data);
+
+/*
+ * modest_platform_connect_and_perform:
+ * @parent_window: the parent #GtkWindow for any interactive or progress feedback UI.
+ * @account: The account to be used.
+ * @callback: will be called when finished, can be NULL
+ * @user_data: user data for @callback
+ * 
+ * Attempts to make a connection, possibly showing interactive UI to achieve this.
+ * This will return immediately if a connection is already open, which results in an instant
+ * call of @callback. While making a connection, @account, if not NULL, will go online too. If
+ * @account is NULL, only a network connection is made using the platform's device.
+ */            
+void modest_platform_connect_and_perform (GtkWindow *parent_window, 
+                                         TnyAccount *account, 
+                                         ModestConnectedPerformer callback, 
+                                         gpointer user_data);
+               
+/*
+ * modest_platform_connect_and_perform_if_network_account:
+ * @parent_window: the parent #GtkWindow for any interactive or progress feedback UI.
+ * @account: The account that might need a connection in subsequent operations.
+ * @callback: will be called when finished, can be NULL
+ * @user_data: user data for @callback
+ * 
+ * Like modest_platform_connect_and_perform(), but only attempts to make a connection if the 
+ * @account uses the network. For instance, this just returns for local maildir accounts. It
+ * will in that case instantly perform the @callback.
+ */
+void modest_platform_connect_and_perform_if_network_account (GtkWindow *parent_window, 
+                                                            TnyAccount *account,
+                                                            ModestConnectedPerformer callback, 
+                                                            gpointer user_data);
+/*
+ * modest_platform_connect_and_perform_if_network_folderstore:
+ * @parent_window: the parent #GtkWindow for any interactive or progress feedback UI.
+ * @folder_store: The folder store (folder or account) that might need a connection in subsequent operations.
+ * @callback: will be called when finished, can be NULL
+ * @user_data: user data for @callback
+ * 
+ * Like modest_platform_connect_and_perform(), but only attempts to make a connection if the 
+ * folder store uses the network. For instance, this just returns for local maildir folders. It
+ * will in that case instantly perform the @callback
+ */
+void modest_platform_connect_and_perform_if_network_folderstore (GtkWindow *parent_window, 
+                                                                TnyFolderStore *folder_store,
+                                                                ModestConnectedPerformer callback, 
+                                                                gpointer user_data);
+
 G_END_DECLS
 
 #endif /* __MODEST_PLATFORM_UTILS_H__ */
index 9368b17..248df08 100644 (file)
@@ -1638,6 +1638,58 @@ new_messages_arrived (ModestMailOperation *self,
                g_object_unref (source);
 }
 
+typedef struct {
+       TnyAccount *account;
+       ModestWindow *win;
+       gchar *account_name;
+} SendReceiveInfo;
+
+static void
+do_send_receive_performer (gboolean canceled, 
+                          GError *err,
+                          GtkWindow *parent_window, 
+                          TnyAccount *account, 
+                          gpointer user_data)
+{
+       ModestMailOperation *mail_op;
+       SendReceiveInfo *info;
+
+       info = (SendReceiveInfo *) user_data;
+
+       if (err || canceled) {
+
+               goto clean;
+       }
+
+       /* Set send/receive operation in progress */    
+       if (info->win && MODEST_IS_MAIN_WINDOW (info->win))
+               modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW (info->win));
+       
+       mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (info->win),
+                                                                modest_ui_actions_send_receive_error_handler,
+                                                                NULL, NULL);
+
+       if (info->win && MODEST_IS_MAIN_WINDOW (info->win))
+               g_signal_connect (G_OBJECT(mail_op), "operation-finished", 
+                                 G_CALLBACK (on_send_receive_finished), 
+                                 info->win);
+
+       /* Send & receive. */
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+       modest_mail_operation_update_account (mail_op, info->account_name, new_messages_arrived, info->win);
+       g_object_unref (G_OBJECT (mail_op));
+       
+ clean:
+       /* Frees */
+       if (info->account_name)
+               g_free (info->account_name);
+       if (info->win)
+               g_object_unref (info->win);
+       if (info->account)
+               g_object_unref (info->account);
+       g_slice_free (SendReceiveInfo, info);
+}
+
 /*
  * This function performs the send & receive required actions. The
  * window is used to create the mail operation. Typically it should
@@ -1649,8 +1701,8 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
                                   ModestWindow *win)
 {
        gchar *acc_name = NULL;
-       ModestMailOperation *mail_op;
-       TnyAccount *store_account = NULL;
+       SendReceiveInfo *info;
+       ModestTnyAccountStore *acc_store;
 
        /* If no account name was provided then get the current account, and if
           there is no current account then pick the default one: */
@@ -1667,44 +1719,18 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
                acc_name = g_strdup (account_name);
        }
 
-       /* Ensure that we have a connection available */
-       store_account =
-               modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
-                                                            acc_name,
-                                                            TNY_ACCOUNT_TYPE_STORE);
+       acc_store = modest_runtime_get_account_store ();
 
-       if (!modest_platform_connect_and_wait (NULL, TNY_ACCOUNT (store_account))) {
-               g_object_unref (store_account);
-               return;
-       }
-       g_object_unref (store_account);
+       /* Create the info for the connect and perform */
+       info = g_slice_new (SendReceiveInfo);
+       info->account_name = acc_name;
+       info->win = (win) ? g_object_ref (win) : NULL;
+       info->account = modest_tny_account_store_get_server_account (acc_store, acc_name,
+                                                                    TNY_ACCOUNT_TYPE_STORE);
 
-       /* Set send/receive operation in progress */    
-       if (win && MODEST_IS_MAIN_WINDOW (win))
-               modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW(win));
-       
-       mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win),
-                                                                modest_ui_actions_send_receive_error_handler,
-                                                                NULL, NULL);
-
-       if (win && MODEST_IS_MAIN_WINDOW (win))
-               g_signal_connect (G_OBJECT(mail_op), "operation-finished", 
-                                 G_CALLBACK (on_send_receive_finished), 
-                                 win);
-
-       /* Send & receive. */
-       /* TODO: The spec wants us to first do any pending deletions, before receiving. */
-       /* Receive and then send. The operation is tagged initially as
-          a receive operation because the account update performs a
-          receive and then a send. The operation changes its type
-          internally, so the progress objects will receive the proper
-          progress information */
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_update_account (mail_op, acc_name, new_messages_arrived, win);
-       g_object_unref (G_OBJECT (mail_op));
-       
-       /* Free */
-       g_free (acc_name);
+       /* Invoke the connect and perform */
+       modest_platform_connect_and_perform ((win) ? GTK_WINDOW (win) : NULL, info->account, 
+                                            do_send_receive_performer, info);
 }
 
 
index 9e3b663..9f2eecd 100644 (file)
@@ -1901,7 +1901,7 @@ modest_header_view_refilter (ModestHeaderView *header_view)
        /* Hide cut headers */
        model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
        if (GTK_IS_TREE_MODEL_FILTER (model)) {
-               priv->status = 0;
+               priv->status = HEADER_VIEW_INIT;
                gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
        }
 }