* Fixes NB#82707, do not enable to delete a message while it's being retrieved

[modest] / src / maemo / modest-main-window.c

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 70c4cad..241a42d 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -2297,7 +2297,7 @@ on_mail_operation_started (ModestMailOperation *mail_op,
        ModestToolBarModes mode;
        GSList *tmp;
        gboolean mode_changed = FALSE;
-       TnyAccount *account;
+       TnyAccount *account = NULL;
 
        self = MODEST_MAIN_WINDOW (user_data);
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
@@ -2325,7 +2325,10 @@ on_mail_operation_started (ModestMailOperation *mail_op,
                priv->retrieving_banner_timeout = 
                        g_timeout_add (2000, show_retrieving_banner, self);
        }
-       g_object_unref (account);
+
+       /* Not every mail operation has account, noop does not */
+       if (account)
+               g_object_unref (account);
               
        /* Get toolbar mode from operation id*/
        mode = get_toolbar_mode_from_mail_operation (self, mail_op, &mode_changed);
@@ -2362,7 +2365,7 @@ on_mail_operation_finished (ModestMailOperation *mail_op,
        GSList *tmp = NULL;
        ModestMainWindow *self;
        gboolean mode_changed;
-       TnyAccount *account;
+       TnyAccount *account = NULL;
        ModestMainWindowPrivate *priv;
 
        self = MODEST_MAIN_WINDOW (user_data);
@@ -2394,7 +2397,10 @@ on_mail_operation_finished (ModestMailOperation *mail_op,
                        priv->retrieving_banner = NULL;
                }
        }
-       g_object_unref (account);
+
+       /* Not every mail operation has account, noop does not */
+       if (account)
+               g_object_unref (account);
 
        /* Get toolbar mode from operation id*/
        mode = get_toolbar_mode_from_mail_operation (self, mail_op, &mode_changed);
@@ -2547,9 +2553,9 @@ refresh_account (const gchar *account_name)
        
        /* If account_name == NULL, we must update all (option All) */
        if (!account_name)
-               modest_ui_actions_do_send_receive_all (win, TRUE, TRUE);
+               modest_ui_actions_do_send_receive_all (win, TRUE, TRUE, TRUE);
        else
-               modest_ui_actions_do_send_receive (account_name, TRUE, TRUE, win);
+               modest_ui_actions_do_send_receive (account_name, TRUE, TRUE, TRUE, win);
        
 }