* Fixes NB#89461, sort dialog is now a HildonPickerDialog with the proper options

[modest] / src / hildon2 / modest-connection-specific-smtp-edit-window.c

diff --git a/src/hildon2/modest-connection-specific-smtp-edit-window.c b/src/hildon2/modest-connection-specific-smtp-edit-window.c
index cda04ec..dd3b615 100644 (file)
--- a/src/hildon2/modest-connection-specific-smtp-edit-window.c
+++ b/src/hildon2/modest-connection-specific-smtp-edit-window.c
@@ -35,6 +35,7 @@
 #include "modest-serversecurity-picker.h"
 #include "modest-secureauth-picker.h"
 #include "widgets/modest-validating-entry.h"
+#include <hildon/hildon-pannable-area.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkvbox.h>
@@ -280,10 +281,10 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
 {
        ModestConnectionSpecificSmtpEditWindowPrivate *priv; 
        GtkWidget *dialog_box;
-       GtkWidget *scrolled_window, *vbox;
+       GtkWidget *pannable, *vbox;
 
        /* The title of this dialog is quite long, so make the window wide enough */
-       gtk_widget_set_size_request (GTK_WIDGET (self), 600, -1);
+       gtk_widget_set_size_request (GTK_WIDGET (self), 600, 320);
 
        priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
        dialog_box = GTK_DIALOG(self)->vbox; /* gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); */
@@ -317,8 +318,10 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
                priv->outgoing_auth_picker = 
                        GTK_WIDGET (modest_secureauth_picker_new (MODEST_EDITABLE_SIZE,
                                                                  MODEST_EDITABLE_ARRANGEMENT));
-               hildon_button_set_title (HILDON_BUTTON (priv->outgoing_auth_picker), _("mcen_li_emailsetup_secure_authentication"));
        }
+       modest_maemo_utils_create_picker_layout (sizegroup, 
+                                                _("mcen_li_emailsetup_secure_authentication"),
+                                                priv->outgoing_auth_picker);
        g_signal_connect (G_OBJECT (priv->outgoing_auth_picker), "value-changed", G_CALLBACK(on_change), self);
        gtk_widget_show (priv->outgoing_auth_picker);
        gtk_box_pack_start (GTK_BOX (vbox), priv->outgoing_auth_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -366,7 +369,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
                MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker), MODEST_PROTOCOLS_TRANSPORT_SMTP);
        modest_serversecurity_picker_set_active_serversecurity (
                MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker), MODEST_PROTOCOLS_CONNECTION_NONE);
-       hildon_button_set_title (HILDON_BUTTON (priv->outgoing_security_picker), _("mcen_li_emailsetup_secure_connection"));
+       modest_maemo_utils_create_picker_layout (sizegroup,  _("mcen_li_emailsetup_secure_connection"), priv->outgoing_security_picker);
        gtk_widget_show (priv->outgoing_security_picker);
        gtk_box_pack_start (GTK_BOX (vbox), priv->outgoing_security_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
        
@@ -397,12 +400,10 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
        priv->range_error_banner_timeout = 0;
        priv->account_name = NULL;
 
-       scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-       gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), vbox);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start (GTK_BOX (dialog_box), scrolled_window, TRUE, TRUE, 0);
-       gtk_container_set_focus_vadjustment (GTK_CONTAINER (vbox), 
-                                            gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
+       pannable = hildon_pannable_area_new ();
+       g_object_set (G_OBJECT (pannable), "initial-hint", TRUE, NULL);
+       hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), vbox);
+       gtk_box_pack_start (GTK_BOX (dialog_box), pannable, TRUE, TRUE, 0);
        
        gtk_widget_show_all (dialog_box);
        gtk_window_set_default_size (GTK_WINDOW (self), -1, 220);