Work to fix bug NB#81294
[modest] / src / maemo / modest-account-view-window.c
index e77b335..b9ea58c 100644 (file)
 #include <widgets/modest-account-view.h>
 
 #include <modest-runtime.h>
+#include "modest-platform.h"
 #include <modest-account-mgr-helpers.h>
 #include <string.h>
 #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 "easysetup/modest-easysetup-wizard-dialog.h"
+#include "modest-account-settings-dialog.h"
+#include <modest-utils.h>
 #include "widgets/modest-ui-constants.h"
 
 /* 'private'/'protected' functions */
@@ -61,9 +62,6 @@ struct _ModestAccountViewWindowPrivate {
        GtkWidget           *delete_button;
        GtkWidget           *close_button;
        ModestAccountView   *account_view;
-       
-       /* We remember this so that we only open one at a time: */
-       ModestEasysetupWizardDialog *wizard;
 };
 #define MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                         MODEST_TYPE_ACCOUNT_VIEW_WINDOW, \
@@ -120,13 +118,6 @@ modest_account_view_window_class_init (ModestAccountViewWindowClass *klass)
 static void
 modest_account_view_window_finalize (GObject *obj)
 {
-       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj);
-       
-       if (priv->wizard) {
-               gtk_widget_destroy (GTK_WIDGET (priv->wizard));
-               priv->wizard = NULL;
-       }
-
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -138,23 +129,87 @@ on_selection_changed (GtkTreeSelection *sel, ModestAccountViewWindow *self)
        GtkTreeModel                   *model;
        GtkTreeIter                     iter;
        gboolean                        has_selection;
-       gchar                          *account_name;
-       gchar                          *default_account_name;
        
        priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
 
        has_selection =
                gtk_tree_selection_get_selected (sel, &model, &iter);
 
+       /* Set the status of the buttons */
        gtk_widget_set_sensitive (priv->edit_button, has_selection);
        gtk_widget_set_sensitive (priv->delete_button, has_selection);  
+}
 
-       account_name = modest_account_view_get_selected_account (priv->account_view);
-       default_account_name = modest_account_mgr_get_default_account(
-               modest_runtime_get_account_mgr());
+/** 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_account (ModestAccountViewWindow *self, const gchar* account_name)
+{
+       ModestTnyAccountStore *acc_store;
+       ModestMailOperationQueue* queue;
+       TnyConnectionStatus store_conn_status, transport_conn_status;
+       TnyAccount *store_account = NULL, *transport_account = NULL;
+       gboolean retval = TRUE;
+       gboolean do_disconnect = TRUE;
+
+       acc_store = modest_runtime_get_account_store ();
+       queue = modest_runtime_get_mail_operation_queue ();
+
+       store_account = 
+               modest_tny_account_store_get_server_account (acc_store,
+                                                            account_name,
+                                                            TNY_ACCOUNT_TYPE_STORE);
+       transport_account = 
+               modest_tny_account_store_get_server_account (acc_store,
+                                                            account_name,
+                                                            TNY_ACCOUNT_TYPE_TRANSPORT);
+
+       store_conn_status = tny_account_get_connection_status (store_account);
+       transport_conn_status = tny_account_get_connection_status (transport_account);
+
+       if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED ||
+           transport_conn_status == TNY_CONNECTION_STATUS_CONNECTED) {
+               gint response;
+
+               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
+                                                               _("emev_nc_disconnect_account"));
+               do_disconnect = (response == FALSE);
+               if (response == GTK_RESPONSE_OK) {
+                       retval = TRUE;
+               } else {
+                       retval = FALSE;
+               }
+       } 
 
-       g_free (account_name);
-       g_free (default_account_name);
+       if (do_disconnect) {
+
+               /* FIXME: We should only cancel those of this account */
+               modest_mail_operation_queue_cancel_all (queue);
+
+               /* Also disconnect the account */
+               if ((tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED) &&
+                   (tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN)) {
+                       tny_account_cancel (store_account);
+                       tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
+                                                     FALSE, NULL, NULL);
+               }
+               if ((tny_account_get_connection_status (transport_account) != TNY_CONNECTION_STATUS_DISCONNECTED) &&
+                   (tny_account_get_connection_status (transport_account) != TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN)) {
+                       tny_account_cancel (transport_account);
+                       tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account),
+                                                     FALSE, NULL, NULL);
+               }
+       }
+               
+       /* Frees */
+       g_object_unref (store_account);
+       g_object_unref (transport_account);
+       
+       return retval;
 }
 
 static void
@@ -174,48 +229,77 @@ 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);
-                       if (!removed) {
-                               g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__);
+               if (check_for_active_account (self, account_name)) {
+                       /* The warning text depends on the account type: */
+                       gchar *txt = NULL;      
+                       gint response;
+
+                       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);
                        }
-               }
-               gtk_widget_destroy (GTK_WIDGET (dialog));
-               g_free (account_title);
+                       
+                       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), txt);
+                       g_free (txt);
+                       txt = NULL;
+
+                       if (response == 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__);
+                               }
+                       }
+                       g_free (account_title);
+               }               
                g_free (account_name);
        }
 }
 
 static void
+on_account_settings_dialog_response (GtkDialog *dialog,
+                                    gint response,
+                                    gpointer user_data)
+{
+       TnyAccount *store_account = NULL;
+       gchar* account_name = NULL;
+       ModestAccountViewWindowPrivate *priv = NULL;
+
+       priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data);
+       account_name = modest_account_view_get_selected_account (priv->account_view);
+       store_account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
+                                                                    account_name,
+                                                                    TNY_ACCOUNT_TYPE_STORE);
+       
+       /* Reconnect the store account, no need to reconnect the
+          transport account because it will connect when needed */
+       if (tny_account_get_connection_status (store_account) == 
+           TNY_CONNECTION_STATUS_DISCONNECTED)
+               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
+                                             TRUE, NULL, NULL);
+
+       /* Disconnect this handler */
+       g_signal_handlers_disconnect_by_func (dialog, on_account_settings_dialog_response, user_data);
+
+       /* Free */
+       g_free (account_name);
+}
+
+static void
 on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
+       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self);
        
        gchar* account_name = modest_account_view_get_selected_account (priv->account_view);
        if (!account_name)
@@ -224,67 +308,59 @@ 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_account (self, account_name)) {
+               GtkWidget *dialog = modest_tny_account_store_show_account_settings_dialog (modest_runtime_get_account_store (), account_name);
                
-       /* 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));
+               /* When the dialog is closed, reconnect */
+               g_signal_connect (dialog, "response", 
+                                 G_CALLBACK (on_account_settings_dialog_response), 
+                                 self);
+       }
        
        g_free (account_name);
 }
 
 static void
 on_wizard_response (GtkDialog *dialog, gint response, gpointer user_data)
-{
-       ModestAccountViewWindow *self = MODEST_ACCOUNT_VIEW_WINDOW (user_data);
-       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-       
+{      
        /* The response has already been handled by the wizard dialog itself,
         * creating the new account.
-        */
-        
+        */      
        /* Destroy the dialog: */
-       if (priv->wizard) {
-               gtk_widget_destroy (GTK_WIDGET (priv->wizard));
-               priv->wizard = NULL;
-       }
+       if (dialog)
+               gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 static void
 on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
+       GtkDialog *wizard;
+       GtkWindow *dialog;
        
-       /* Show the easy-setup wizard: */
-       
-       if (priv->wizard) {
-               /* Just show the existing window: */
-               gtk_window_present (GTK_WINDOW (priv->wizard));
-       } else {
-               /* Create and show the dialog: */
-               priv->wizard = modest_easysetup_wizard_dialog_new ();
-               
-               gtk_window_set_transient_for (GTK_WINDOW (priv->wizard), GTK_WINDOW (self));
-               
-               /* Destroy the dialog when it is closed: */
-               g_signal_connect (G_OBJECT (priv->wizard), "response", G_CALLBACK (on_wizard_response), self);
-               gtk_widget_show (GTK_WIDGET (priv->wizard));
+       /* Show the easy-setup wizard: */       
+       dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr());
+       if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) {
+               /* old wizard is active already; 
+                */
+               gtk_window_present (dialog);
+               return;
        }
+       
+       /* there is no such wizard yet */
+       wizard = GTK_DIALOG (modest_easysetup_wizard_dialog_new ());
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), 
+                                    GTK_WINDOW (wizard));
+
+       /* if there is already another modal dialog, make it non-modal */
+       if (dialog)
+               gtk_window_set_modal (GTK_WINDOW(dialog), FALSE);
+       
+       gtk_window_set_modal (GTK_WINDOW (wizard), TRUE);
+       gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self));
+       /* 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));
 }
 
 
@@ -338,7 +414,6 @@ button_box_new (ModestAccountViewWindow *self)
        return button_box;
 }
 
-
 static GtkWidget*
 window_vbox_new (ModestAccountViewWindow *self)
 {
@@ -348,7 +423,10 @@ window_vbox_new (ModestAccountViewWindow *self)
        GtkWidget *main_hbox     = gtk_hbox_new (FALSE, 6);
        
        priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr());
-       gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), 300, 400);
+
+       /* Only force the height, the width of the widget will depend
+          on the size of the column titles */
+       gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), -1, 400);
        gtk_widget_show (GTK_WIDGET (priv->account_view));
 
        GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view));
@@ -375,9 +453,6 @@ window_vbox_new (ModestAccountViewWindow *self)
 static void
 modest_account_view_window_init (ModestAccountViewWindow *obj)
 {
-/*
-       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj);
-*/             
        gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->vbox)), GTK_WIDGET (window_vbox_new (obj)), 
                TRUE, TRUE, 2);
        
@@ -385,8 +460,8 @@ modest_account_view_window_init (ModestAccountViewWindow *obj)
                TRUE, TRUE, 2);
 
        gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts"));
-}
 
+}
 
 GtkWidget*
 modest_account_view_window_new (void)