* get rid of guess_mime_type_from_name, use gnome_vfs_get_mime_from_name instead

[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 776f84c..3384d05 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -154,28 +154,53 @@ on_selection_changed (GtkTreeSelection *sel, ModestAccountViewWindow *self)
  * Returns FALSE if the user chose to cancel his request instead.
  */
 static gboolean
-check_for_active_acount (ModestAccountViewWindow *self, const gchar* account_name)
+check_for_active_account (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));
+       ModestTnyAccountStore *acc_store;
+       ModestMailOperationQueue* queue;
+       TnyConnectionStatus store_conn_status, transport_conn_status;
+       TnyAccount *store_account = NULL, *transport_account = NULL;
+       gboolean retval = 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_STORE);
+
+       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) {
+               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);
                if (response == GTK_RESPONSE_OK) {
                        /* FIXME: We should only cancel those of this account */
-                       modest_mail_operation_queue_cancel_all(queue);
-                       return TRUE;
+                       modest_mail_operation_queue_cancel_all (queue);
+                       retval = TRUE;
+               } else {
+                       retval = FALSE;
                }
-               else
-                       return FALSE;
        }
+
+       /* Frees */
+       g_object_unref (store_account);
+       g_object_unref (transport_account);
        
-       return TRUE;
+       return retval;
 }
 
 static void
@@ -195,7 +220,7 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        if (account_name) {
                gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name);
                
-               if (check_for_active_acount (self, account_name)) {
+               if (check_for_active_account (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) 
@@ -209,6 +234,7 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                        
                        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));
                        g_free (txt);
                        txt = NULL;
@@ -248,12 +274,13 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        /* Check whether any connections are active, and cancel them if 
         * the user wishes.
         */
-       if (check_for_active_acount (self, account_name)) {
+       if (check_for_active_account (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_modal (GTK_WINDOW (dialog), TRUE);
                modest_maemo_show_dialog_and_forget (GTK_WINDOW (self), GTK_DIALOG (dialog));
        }
        
@@ -281,8 +308,7 @@ on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        GtkDialog *wizard;
        
        /* Show the easy-setup wizard: */       
-       wizard = modest_window_mgr_get_easysetup_dialog
-               (modest_runtime_get_window_mgr());
+       wizard = modest_window_mgr_get_easysetup_dialog (modest_runtime_get_window_mgr());
        if (wizard) {
                /* old wizard is active already; 
                 */
@@ -291,10 +317,11 @@ on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        } 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));
+               modest_window_mgr_set_easysetup_dialog (modest_runtime_get_window_mgr(), 
+                                                       GTK_DIALOG(wizard));
        } 
        
+       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