* cleaner version of the patch to make sure no double account-setup-wizards are
[modest] / src / maemo / modest-account-view-window.c
index 6828ac4..776f84c 100644 (file)
@@ -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 */
@@ -146,6 +147,37 @@ on_selection_changed (GtkTreeSelection *sel, ModestAccountViewWindow *self)
        g_free (default_account_name);
 }
 
+/** Check whether any connections are active, and cancel them if 
+ * the user wishes.
+ * Returns TRUE is there was no problem, 
+ * or if an operation was cancelled so we can continue.
+ * Returns FALSE if the user chose to cancel his request instead.
+ */
+static gboolean
+check_for_active_acount (ModestAccountViewWindow *self, const gchar* account_name)
+{
+       /* 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);
+                       return TRUE;
+               }
+               else
+                       return FALSE;
+       }
+       
+       return TRUE;
+}
+
 static void
 on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
@@ -163,42 +195,43 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        if (account_name) {
                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);
-               }
-               
-               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 (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);
-                       if (default_account_name && (strcmp (default_account_name, account_name) == 0))
-                               is_default = TRUE;
-                       g_free (default_account_name);
-                               
-                       gboolean removed = modest_account_mgr_remove_account (account_mgr,
-                                                                            account_name,
-                                                                            FALSE);
-                       if (!removed) {
-                               g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__);
+               if (check_for_active_acount (self, 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);
                        }
+                       
+                       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 (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);
+                               if (default_account_name && (strcmp (default_account_name, account_name) == 0))
+                                       is_default = TRUE;
+                               g_free (default_account_name);
+                                       
+                               gboolean removed = modest_account_mgr_remove_account (account_mgr, account_name);
+                               if (!removed) {
+                                       g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__);
+                               }
+                       }
+                       gtk_widget_destroy (GTK_WIDGET (dialog));
+                       g_free (account_title);
                }
-               gtk_widget_destroy (GTK_WIDGET (dialog));
-               g_free (account_title);
+               
                g_free (account_name);
        }
 }
@@ -215,40 +248,58 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        /* 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;
-       }
+       if (check_for_active_acount (self, account_name)) {
                
-       /* Show the Account Settings window: */
-       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));
+               /* Show the Account Settings window: */
+               ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
+
+               modest_account_settings_dialog_set_account_name (dialog, account_name);
+               modest_maemo_show_dialog_and_forget (GTK_WINDOW (self), GTK_DIALOG (dialog));
+       }
        
        g_free (account_name);
 }
 
 static void
+on_wizard_response (GtkDialog *dialog, gint response, gpointer user_data)
+{      
+       /* The response has already been handled by the wizard dialog itself,
+        * creating the new account.
+        */
+        
+       /* Destroy the dialog: */
+       if (dialog) {
+               gtk_widget_destroy (GTK_WIDGET (dialog));
+               modest_window_mgr_set_easysetup_dialog (
+                       modest_runtime_get_window_mgr(), NULL);
+       }
+}
+
+static void
 on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-       /* Show the easy-setup wizard: */
-       ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new ();
+       GtkDialog *wizard;
+       
+       /* Show the easy-setup wizard: */       
+       wizard = modest_window_mgr_get_easysetup_dialog
+               (modest_runtime_get_window_mgr());
+       if (wizard) {
+               /* old wizard is active already; 
+                */
+               gtk_window_present (GTK_WINDOW(wizard));
+               return;
+       } else {
+               /* there is no such wizard yet */
+               wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ());
+               modest_window_mgr_set_easysetup_dialog
+                       (modest_runtime_get_window_mgr(), GTK_DIALOG(wizard));
+       } 
+       
        gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self));
-       gtk_dialog_run (GTK_DIALOG (wizard));
-       gtk_widget_destroy (GTK_WIDGET (wizard));
+       /* Destroy the dialog when it is closed: */
+       g_signal_connect (G_OBJECT (wizard), "response", G_CALLBACK
+                         (on_wizard_response), self);
+       gtk_widget_show (GTK_WIDGET (wizard));
 }