2007-05-04 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 9350739..869600e 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -38,6 +38,8 @@
 #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-ui-constants.h"
 
 /* 'private'/'protected' functions */
 static void                            modest_account_view_window_class_init   (ModestAccountViewWindowClass *klass);
@@ -178,9 +180,23 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
                        /* Remove account. If succeeded it removes also 
                           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);
+                               
                        removed = modest_account_mgr_remove_account (account_mgr,
-                                                                    account_name,
-                                                                    FALSE);                                             
+                                                                            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 {
@@ -195,13 +211,21 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 static void
 on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *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)
+               return;
+               
        /* Show the Account Settings window: */
-       ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new (void);
+       ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
        modest_account_settings_dialog_set_account_name (dialog, account_name);
        
        gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
        gtk_dialog_run (GTK_DIALOG (dialog));
        gtk_widget_destroy (GTK_WIDGET (dialog));
+       
+       g_free (account_name);
 }
 
 static void
@@ -217,7 +241,7 @@ on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 
 static void
 on_close_button_clicked (GtkWidget *button, gpointer user_data)
-{
+{              
        ModestAccountViewWindow *self = MODEST_ACCOUNT_VIEW_WINDOW (user_data);
 
        gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
@@ -236,9 +260,9 @@ button_box_new (ModestAccountViewWindow *self)
                                   GTK_BUTTONBOX_START);
        
        priv->new_button     = gtk_button_new_from_stock(_("mcen_bd_new"));
-       priv->edit_button = gtk_button_new_with_label(_("mcen_bd_emailsetup_edit"));
-       priv->delete_button  = gtk_button_new_from_stock(_("mcen_bd_emailsetup_delete"));
-       priv->close_button    = gtk_button_new_from_stock(_("mcen_bd_emailsetup_close"));
+       priv->edit_button = gtk_button_new_with_label(_("mcen_bd_edit"));
+       priv->delete_button  = gtk_button_new_from_stock(_("mcen_bd_delete"));
+       priv->close_button    = gtk_button_new_from_stock(_("mcen_bd_close"));
        
        g_signal_connect (G_OBJECT(priv->new_button), "clicked",
                          G_CALLBACK(on_new_button_clicked),
@@ -283,6 +307,9 @@ window_vbox_new (ModestAccountViewWindow *self)
                          self);
                          
        GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+       gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), MODEST_MARGIN_DEFAULT);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, 
+               GTK_POLICY_AUTOMATIC);
        gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (priv->account_view));
        gtk_widget_show (GTK_WIDGET (scrolled_window));