2007-06-12 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 4a14f06..fc40ea2 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -39,6 +39,7 @@
 #include "modest-tny-platform-factory.h"
 #include "maemo/easysetup/modest-easysetup-wizard.h"
 #include "maemo/modest-account-settings-dialog.h"
+#include "widgets/modest-ui-constants.h"
 
 /* 'private'/'protected' functions */
 static void                            modest_account_view_window_class_init   (ModestAccountViewWindowClass *klass);
@@ -150,18 +151,22 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
        ModestAccountViewWindowPrivate *priv;
        ModestAccountMgr *account_mgr;
-       gchar *account_name;
+       
        
        priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
 
        account_mgr = modest_runtime_get_account_mgr(); 
-       account_name = modest_account_view_get_selected_account (priv->account_view);
+       gchar *account_name = modest_account_view_get_selected_account (priv->account_view);
+       if(!account_name)
+               return;
+               
+       gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name);
 
        if (account_name) {
                gboolean removed;
                GtkWidget *dialog;
                gchar *txt;
-
+               
                dialog = gtk_dialog_new_with_buttons (_("Confirmation dialog"),
                                                      GTK_WINDOW (self),
                                                      GTK_DIALOG_MODAL,
@@ -170,7 +175,8 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                                                      GTK_STOCK_OK,
                                                      GTK_RESPONSE_ACCEPT,
                                                      NULL);
-               txt = g_strdup_printf (_("Do you really want to delete the account %s?"), account_name);
+               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);
                gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
@@ -179,9 +185,17 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
                        /* Remove account. If succeeded it removes also 
                           the account from the ModestAccountView */
+                         
+                       gboolean is_default = FALSE;
+                       gchar *default_account_name = modest_account_mgr_get_default_account (account_mgr);
+                       if (default_account_name && (strcmp (default_account_name, account_name) == 0))
+                               is_default = TRUE;
+                       g_free (default_account_name);
+                               
                        removed = modest_account_mgr_remove_account (account_mgr,
-                                                                    account_name,
-                                                                    FALSE);                                             
+                                                                            account_name,
+                                                                            FALSE);
+                                                                            
                        if (removed) {
                                /* Show confirmation dialog ??? */
                        } else {
@@ -189,6 +203,7 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                        }
                }
                gtk_widget_destroy (dialog);
+               g_free (account_title);
                g_free (account_name);
        }
 }
@@ -202,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.
+        * 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;
+       }
+               
        /* Show the Account Settings window: */
        ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
        modest_account_settings_dialog_set_account_name (dialog, account_name);
@@ -292,6 +325,9 @@ window_vbox_new (ModestAccountViewWindow *self)
                          self);
                          
        GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+       gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), MODEST_MARGIN_DEFAULT);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, 
+               GTK_POLICY_AUTOMATIC);
        gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (priv->account_view));
        gtk_widget_show (GTK_WIDGET (scrolled_window));
        
@@ -316,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"));
 }