2007-07-09 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 1a57a12..6f08eec 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 <maemo/modest-maemo-utils.h>
 #include "widgets/modest-ui-constants.h"
 
 /* 'private'/'protected' functions */
@@ -160,31 +161,29 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        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;
+               gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name);
+               
+               /* The warning text depends on the account type: */
+               gchar *txt = NULL;      
+               if (modest_account_mgr_get_store_protocol (account_mgr, account_name) 
+                       == MODEST_PROTOCOL_STORE_POP) {
+                       txt = g_strdup_printf (_("emev_nc_delete_mailbox"), 
+                               account_title);
+               } else {
+                       txt = g_strdup_printf (_("emev_nc_delete_mailboximap"), 
+                               account_title);
+               }
                
-               dialog = gtk_dialog_new_with_buttons (_("Confirmation dialog"),
-                                                     GTK_WINDOW (self),
-                                                     GTK_DIALOG_MODAL,
-                                                     GTK_STOCK_CANCEL,
-                                                     GTK_RESPONSE_REJECT,
-                                                     GTK_STOCK_OK,
-                                                     GTK_RESPONSE_ACCEPT,
-                                                     NULL);
-               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));
+               GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self), 
+                       txt));
+               gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
                g_free (txt);
+               txt = NULL;
 
-               if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
-                       /* Remove account. If succeeded it removes also 
-                          the account from the ModestAccountView */
+               if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) {
+                       /* Remove account. If it succeeds then it also removes
+                          the account from the ModestAccountView: */
                          
                        gboolean is_default = FALSE;
                        gchar *default_account_name = modest_account_mgr_get_default_account (account_mgr);
@@ -192,17 +191,14 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                                is_default = TRUE;
                        g_free (default_account_name);
                                
-                       removed = modest_account_mgr_remove_account (account_mgr,
+                       gboolean removed = modest_account_mgr_remove_account (account_mgr,
                                                                             account_name,
                                                                             FALSE);
-                                                                            
-                       if (removed) {
-                               /* Show confirmation dialog ??? */
-                       } else {
-                               /* Show error dialog ??? */
+                       if (!removed) {
+                               g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__);
                        }
                }
-               gtk_widget_destroy (dialog);
+               gtk_widget_destroy (GTK_WIDGET (dialog));
                g_free (account_title);
                g_free (account_name);
        }
@@ -219,17 +215,17 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                
        /* 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)) {
+       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) {
-                       modest_mail_operation_queue_cancel_all(queue);;
+                       /* FIXME: We should only cancel those of this account */
+                       modest_mail_operation_queue_cancel_all(queue);
                }
                else
                        return;
@@ -239,9 +235,7 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
        modest_account_settings_dialog_set_account_name (dialog, account_name);
        
-       gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
-       gtk_dialog_run (GTK_DIALOG (dialog));
-       gtk_widget_destroy (GTK_WIDGET (dialog));
+       modest_maemo_show_dialog_and_forget (GTK_WINDOW (self), GTK_DIALOG (dialog));
        
        g_free (account_name);
 }