2007-06-12 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 feb65ea..fc40ea2 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -166,10 +166,6 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                gboolean removed;
                GtkWidget *dialog;
                gchar *txt;
-
-               /* Freeze updates, so we can do just one update afterwards, 
-                * instead of responding to every conf key change: */
-               modest_account_view_block_conf_updates (priv->account_view);
                
                dialog = gtk_dialog_new_with_buttons (_("Confirmation dialog"),
                                                      GTK_WINDOW (self),
@@ -200,12 +196,6 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                                                                             account_name,
                                                                             FALSE);
                                                                             
-                       if (removed && is_default) {
-                               /* Set a different account as the default, so there is always at least one default:
-                                * This is not specified, and might be the wrong behaviour. murrayc. */
-                               modest_account_mgr_set_first_account_as_default (account_mgr);
-                       }
-                                                                        
                        if (removed) {
                                /* Show confirmation dialog ??? */
                        } else {
@@ -215,9 +205,6 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                gtk_widget_destroy (dialog);
                g_free (account_title);
                g_free (account_name);
-               
-               /* Update the view: */
-               modest_account_view_unblock_conf_updates (priv->account_view);
        }
 }
 
@@ -242,16 +229,12 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                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);;
+                       modest_mail_operation_queue_cancel_all(queue);
                }
                else
                        return;
        }
                
-       /* Freeze updates, so we can do just one update afterwards, 
-        * instead of responding to every conf key change: */
-       modest_account_view_block_conf_updates (priv->account_view);
-               
        /* Show the Account Settings window: */
        ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
        modest_account_settings_dialog_set_account_name (dialog, account_name);
@@ -261,31 +244,16 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        gtk_widget_destroy (GTK_WIDGET (dialog));
        
        g_free (account_name);
-       
-       /* Update the view: */
-       modest_account_view_unblock_conf_updates (priv->account_view);
-       
-       /* TODO: Call modest_account_view_select_account() when 
-        * the view has actually been update. */
 }
 
 static void
 on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-       
-       /* Freeze updates, so we can do just one update afterwards, 
-        * instead of responding to every conf key change: */
-       modest_account_view_block_conf_updates (priv->account_view);
-       
        /* Show the easy-setup wizard: */
        ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new ();
        gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self));
        gtk_dialog_run (GTK_DIALOG (wizard));
        gtk_widget_destroy (GTK_WIDGET (wizard));
-       
-       /* Allow updates: */
-       modest_account_view_unblock_conf_updates (priv->account_view);
 }