Work to fix bug NB#81294

[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 57ebd91..b9ea58c 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -38,9 +38,9 @@
 #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 */
@@ -154,6 +154,7 @@ check_for_active_account (ModestAccountViewWindow *self, const gchar* account_na
        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 ();
@@ -172,35 +173,38 @@ check_for_active_account (ModestAccountViewWindow *self, const gchar* account_na
 
        if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED ||
            transport_conn_status == TNY_CONNECTION_STATUS_CONNECTED) {
-               GtkWidget *note = NULL;
                gint response;
 
-               note = hildon_note_new_confirmation (GTK_WINDOW (self), 
-                                                    _("emev_nc_disconnect_account"));
-               response = gtk_dialog_run (GTK_DIALOG(note));
-
-               gtk_widget_destroy (note);
+               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
+                                                               _("emev_nc_disconnect_account"));
+               do_disconnect = (response == FALSE);
                if (response == GTK_RESPONSE_OK) {
-                       /* 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_CONNECTED) {
-                               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_CONNECTED) {
-                               tny_account_cancel (transport_account);
-                               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account),
-                                                             FALSE, NULL, NULL);
-                       }
                        retval = TRUE;
                } else {
                        retval = FALSE;
                }
-       }
+       } 
 
+       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);
@@ -239,17 +243,9 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                                        account_title);
                        }
                        
-                       GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self), 
-                               txt));
-                       gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-                       gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
+                       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), txt);
                        g_free (txt);
                        txt = NULL;
-       
-                       response = gtk_dialog_run (dialog);
-                       gtk_widget_destroy (GTK_WIDGET (dialog));
-                       while (gtk_events_pending ())
-                               gtk_main_iteration ();
 
                        if (response == GTK_RESPONSE_OK) {
                                /* Remove account. If it succeeds then it also removes
@@ -313,19 +309,12 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
         * the user wishes.
         */
        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_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog));
-
                /* When the dialog is closed, reconnect */
                g_signal_connect (dialog, "response", 
                                  G_CALLBACK (on_account_settings_dialog_response), 
                                  self);
-
-               modest_maemo_show_dialog_and_forget (GTK_WINDOW (self), GTK_DIALOG (dialog));
        }
        
        g_free (account_name);
@@ -435,7 +424,9 @@ window_vbox_new (ModestAccountViewWindow *self)
        
        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));
@@ -477,8 +468,5 @@ modest_account_view_window_new (void)
 {
        GObject *obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL);
        
-       /* Attach dialog help */
-       modest_platform_set_dialog_help (GTK_DIALOG (obj), "applications_email_accountsettings");
-
        return GTK_WIDGET(obj);
 }