* Some aesthetic changes

[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 3384d05..3e90c4b 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -128,23 +128,15 @@ 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());
-
-       g_free (account_name);
-       g_free (default_account_name);
 }
 
 /** Check whether any connections are active, and cancel them if 
@@ -297,7 +289,7 @@ on_wizard_response (GtkDialog *dialog, gint response, gpointer user_data)
        /* Destroy the dialog: */
        if (dialog) {
                gtk_widget_destroy (GTK_WIDGET (dialog));
-               modest_window_mgr_set_easysetup_dialog (
+               modest_window_mgr_set_modal_dialog (
                        modest_runtime_get_window_mgr(), NULL);
        }
 }
@@ -305,21 +297,25 @@ on_wizard_response (GtkDialog *dialog, gint response, gpointer user_data)
 static void
 on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-       GtkDialog *wizard;
+       GtkDialog *wizard, *dialog;
        
        /* Show the easy-setup wizard: */       
-       wizard = modest_window_mgr_get_easysetup_dialog (modest_runtime_get_window_mgr());
-       if (wizard) {
+       dialog = modest_window_mgr_get_modal_dialog (modest_runtime_get_window_mgr());
+       if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) {
                /* old wizard is active already; 
                 */
-               gtk_window_present (GTK_WINDOW(wizard));
+               gtk_window_present (GTK_WINDOW(dialog));
                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));
-       } 
+       }
+       
+       /* there is no such wizard yet */
+       wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ());
+       modest_window_mgr_set_modal_dialog (modest_runtime_get_window_mgr(), 
+                                           GTK_DIALOG(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));
@@ -380,7 +376,6 @@ button_box_new (ModestAccountViewWindow *self)
        return button_box;
 }
 
-
 static GtkWidget*
 window_vbox_new (ModestAccountViewWindow *self)
 {
@@ -390,6 +385,7 @@ 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);
        gtk_widget_show (GTK_WIDGET (priv->account_view));
 
@@ -417,9 +413,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);
        
@@ -429,7 +422,6 @@ modest_account_view_window_init (ModestAccountViewWindow *obj)
        gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts"));
 }
 
-
 GtkWidget*
 modest_account_view_window_new (void)
 {