2007-06-21 Murray Cumming <murrayc@murrayc.com>

[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 eba9ad3..3279549 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -166,7 +166,7 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                gboolean removed;
                GtkWidget *dialog;
                gchar *txt;
-
+               
                dialog = gtk_dialog_new_with_buttons (_("Confirmation dialog"),
                                                      GTK_WINDOW (self),
                                                      GTK_DIALOG_MODAL,
@@ -175,9 +175,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);
@@ -198,12 +196,6 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                                                                             account_name,
                                                                             FALSE);
                                                                             
-                       if (removed && is_default) {
-                               /* Set a different account as the default, so there is always at least one default:
-                                * This is not specified, and might be the wrong behaviour. murrayc. */
-                               modest_account_mgr_set_first_account_as_default (account_mgr);
-                       }
-                                                                        
                        if (removed) {
                                /* Show confirmation dialog ??? */
                        } else {
@@ -225,6 +217,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.
+        */
+       ModestAccountMgr* mgr = modest_runtime_get_account_mgr ();
+       ModestMailOperationQueue* queue = modest_runtime_get_mail_operation_queue();
+       if (modest_account_mgr_account_is_busy(mgr, account_name)) {
+               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) {
+                       /* FIXME: We should only cancel those of this account */
+                       modest_mail_operation_queue_cancel_all(queue);
+               }
+               else
+                       return;
+       }
+               
        /* Show the Account Settings window: */
        ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
        modest_account_settings_dialog_set_account_name (dialog, account_name);
@@ -342,6 +352,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"));
 }