* Fixes: NB#56474

[modest] / src / maemo / modest-account-view-window.c

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index 0307e4e..feb65ea 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -179,9 +179,7 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                                                      GTK_STOCK_OK,
                                                      GTK_RESPONSE_ACCEPT,
                                                      NULL);
-               /* TODO: This confirmation dialog is not specified in the Maemo UI spec, 
-                * but we really need one: */
-               txt = g_strdup_printf (_("Do you really want to delete the account %s?"), 
+               txt = g_strdup_printf (_("emev_nc_delete_mailboximap"), 
                        account_title);
                gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), 
                                    gtk_label_new (txt), FALSE, FALSE, 0);
@@ -232,6 +230,24 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        if (!account_name)
                return;
                
+       /* Check whether any connections are active, and cancel them if 
+        * the user wishes.
+        * TODO: Check only for connections with this account, instead of all.
+        * Maybe we need a queue per account.
+        */
+       ModestMailOperationQueue* queue = modest_runtime_get_mail_operation_queue ();
+       if (modest_mail_operation_queue_num_elements(queue)) {
+               GtkWidget *note = hildon_note_new_confirmation (GTK_WINDOW (self), 
+                       _("emev_nc_disconnect_account"));
+               const int response = gtk_dialog_run (GTK_DIALOG(note));
+               gtk_widget_destroy (note);
+               if (response == GTK_RESPONSE_OK) {
+                       modest_mail_operation_queue_cancel_all(queue);;
+               }
+               else
+                       return;
+       }
+               
        /* Freeze updates, so we can do just one update afterwards, 
         * instead of responding to every conf key change: */
        modest_account_view_block_conf_updates (priv->account_view);
@@ -247,7 +263,10 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        g_free (account_name);
        
        /* Update the view: */
-       modest_account_view_unblock_conf_updates (priv->account_view);  
+       modest_account_view_unblock_conf_updates (priv->account_view);
+       
+       /* TODO: Call modest_account_view_select_account() when 
+        * the view has actually been update. */
 }
 
 static void
@@ -365,6 +384,8 @@ modest_account_view_window_init (ModestAccountViewWindow *obj)
        
        gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->action_area)), GTK_WIDGET (button_box_new (obj)), 
                TRUE, TRUE, 2);
+
+       gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts"));
 }