* Fixes NB#103682, correctly select the default region

[modest] / src / hildon2 / modest-account-view-window.c

diff --git a/src/hildon2/modest-account-view-window.c b/src/hildon2/modest-account-view-window.c
index 9cbfed1..95111a5 100644 (file)
--- a/src/hildon2/modest-account-view-window.c
+++ b/src/hildon2/modest-account-view-window.c
@@ -60,7 +60,6 @@ enum {
 
 typedef struct _ModestAccountViewWindowPrivate ModestAccountViewWindowPrivate;
 struct _ModestAccountViewWindowPrivate {
-       GtkWidget           *new_button;
        GtkWidget           *edit_button;
        ModestAccountView   *account_view;
        guint acc_removed_handler;
@@ -272,6 +271,7 @@ on_account_activated (GtkTreeView *account_view,
                        ModestAccountSettingsDialog *dialog =
                                modest_account_protocol_get_account_settings_dialog (proto, account_name);
                        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), GTK_WINDOW (self));
+                       gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), FALSE);
                        gtk_widget_show (GTK_WIDGET (dialog));
                }
        }
@@ -279,60 +279,6 @@ on_account_activated (GtkTreeView *account_view,
 }
 
 static void
-on_wizard_response (GtkDialog *dialog, 
-                   gint response, 
-                   gpointer user_data)
-{      
-       /* The response has already been handled by the wizard dialog itself,
-        * creating the new account.
-        */      
-       if (dialog)
-               gtk_widget_destroy (GTK_WIDGET (dialog));
-
-       /* Re-focus the account list view widget */
-       if (MODEST_IS_ACCOUNT_VIEW_WINDOW (user_data)) {
-               ModestAccountViewWindowPrivate *priv;
-               priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data);
-               gtk_widget_grab_focus (GTK_WIDGET (priv->account_view));
-       }
-}
-
-static void
-on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
-{
-       GtkDialog *wizard;
-
-       /* there is no such wizard yet */
-       wizard = GTK_DIALOG (modest_easysetup_wizard_dialog_new ());
-       modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), 
-                                    GTK_WINDOW (wizard), GTK_WINDOW (self));
-
-       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
-                         (on_wizard_response), self);
-       gtk_widget_show (GTK_WIDGET (wizard));
-}
-
-static void
-setup_button_box (ModestAccountViewWindow *self, GtkButtonBox *box)
-{
-       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-
-       priv->new_button     = gtk_button_new_from_stock(_HL("wdgt_bd_new"));
-       hildon_gtk_widget_set_theme_size (priv->new_button,
-                                         HILDON_SIZE_FINGER_HEIGHT);
-
-       g_signal_connect (G_OBJECT(priv->new_button), "clicked",
-                         G_CALLBACK(on_new_button_clicked),
-                         self);
-       gtk_box_pack_start (GTK_BOX(box), priv->new_button, FALSE, FALSE,0);
-
-       gtk_widget_show_all (GTK_WIDGET (box));
-}
-
-static void
 window_vbox_new (ModestAccountViewWindow *self)
 {
 }
@@ -346,7 +292,7 @@ modest_account_view_window_init (ModestAccountViewWindow *self)
 
 
        /* Specify a default size */
-       gtk_window_set_default_size (GTK_WINDOW (self), -1, 320);
+       gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
        
        /* This seems to be necessary to make the window show at the front with decoration.
         * If we use property type=GTK_WINDOW_TOPLEVEL instead of the default GTK_WINDOW_POPUP+decoration, 
@@ -357,12 +303,12 @@ modest_account_view_window_init (ModestAccountViewWindow *self)
        priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
        priv->acc_removed_handler = 0;
        priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr());
+       modest_account_view_set_picker_mode (MODEST_ACCOUNT_VIEW (priv->account_view), TRUE);
 
        main_vbox = GTK_DIALOG (self)->vbox;
 
        pannable = hildon_pannable_area_new ();
        g_object_set (G_OBJECT (pannable), "initial-hint", TRUE, NULL);
-       gtk_container_set_border_width (GTK_CONTAINER (pannable), MODEST_MARGIN_DEFAULT);
        gtk_widget_show (pannable);
        gtk_container_add (GTK_CONTAINER (pannable), 
                           GTK_WIDGET (priv->account_view));
@@ -371,7 +317,7 @@ modest_account_view_window_init (ModestAccountViewWindow *self)
        g_signal_connect (G_OBJECT (priv->account_view), "row-activated",
                          G_CALLBACK (on_account_activated), self);
 
-       gtk_box_pack_start (GTK_BOX(main_vbox), pannable, TRUE, TRUE, MODEST_MARGIN_HALF);
+       gtk_box_pack_start (GTK_BOX(main_vbox), pannable, TRUE, TRUE, MODEST_MARGIN_DEFAULT);
 
 }
 
@@ -403,8 +349,6 @@ modest_account_view_window_new (void)
        /* Add widgets */
        window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW (self));
        
-       setup_button_box (MODEST_ACCOUNT_VIEW_WINDOW (self), GTK_BUTTON_BOX (GTK_DIALOG (self)->action_area));
-
        gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_emailsetup_accounts"));
 
        /* Connect signals */