* Fill in the incoming security options

[modest] / src / hildon2 / modest-maemo-security-options-view.c

diff --git a/src/hildon2/modest-maemo-security-options-view.c b/src/hildon2/modest-maemo-security-options-view.c
index cebf7cc..2038b5f 100644 (file)
--- a/src/hildon2/modest-maemo-security-options-view.c
+++ b/src/hildon2/modest-maemo-security-options-view.c
@@ -40,6 +40,7 @@
 #include "modest-maemo-utils.h"
 #include <hildon/hildon-number-editor.h>
 #include <hildon/hildon-check-button.h>
+#include "modest-hildon-includes.h"
 
 #define PORT_MIN 1
 #define PORT_MAX 65535
@@ -76,7 +77,7 @@ on_security_changed (GtkWidget *widget,
 
        if (MODEST_SECURITY_OPTIONS_VIEW (self)->type == MODEST_SECURITY_OPTIONS_INCOMING) {
                /* Activate and dim checkbutton if it's secure */
-               hildon_check_button_set_active (GTK_BUTTON (ppriv->auth_view), 
+               hildon_check_button_set_active (HILDON_CHECK_BUTTON (ppriv->auth_view), 
                                                is_secure);
                gtk_widget_set_sensitive (ppriv->auth_view, !is_secure);
        } else {
@@ -130,13 +131,15 @@ create_incoming_security (ModestSecurityOptionsView* self,
                          GtkSizeGroup *size_group)
 {
        ModestSecurityOptionsViewPrivate *ppriv;
-       GtkWidget *check_caption, *entry_caption = NULL;
+       GtkWidget *entry_caption = NULL;
 
        ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
 
        /* Create widgets for incoming security */
        ppriv->security_view = GTK_WIDGET (modest_serversecurity_picker_new (MODEST_EDITABLE_SIZE,
                                                                             MODEST_EDITABLE_ARRANGEMENT));
+       modest_serversecurity_picker_fill (MODEST_SERVERSECURITY_PICKER (ppriv->security_view), 
+                                          modest_protocol_registry_get_pop_type_id ());
        modest_maemo_utils_create_picker_layout (size_group, 
                                                 _("mcen_li_emailsetup_secure_connection"), 
                                                 ppriv->security_view);
@@ -148,9 +151,8 @@ create_incoming_security (ModestSecurityOptionsView* self,
        }
 
        ppriv->auth_view = hildon_check_button_new (MODEST_EDITABLE_SIZE);
-       check_caption = modest_maemo_utils_create_captioned (size_group, 
-                                                            _("mcen_li_emailsetup_secure_authentication"),
-                                                            ppriv->auth_view);
+       gtk_button_set_label (GTK_BUTTON (ppriv->auth_view), _("mcen_li_emailsetup_secure_authentication"));
+       gtk_size_group_add_widget (size_group, ppriv->auth_view);
 
        /* Track changes in UI */       
        g_signal_connect (G_OBJECT (ppriv->security_view), "value-changed",
@@ -162,7 +164,7 @@ create_incoming_security (ModestSecurityOptionsView* self,
        if (ppriv->full)
                gtk_box_pack_start (GTK_BOX (self), entry_caption, 
                                    FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_box_pack_start (GTK_BOX (self), check_caption,
+       gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view,
                            FALSE, FALSE, MODEST_MARGIN_HALF);
 
        /* Show widgets */
@@ -172,7 +174,6 @@ create_incoming_security (ModestSecurityOptionsView* self,
        }
        gtk_widget_show (ppriv->security_view);
        gtk_widget_show (ppriv->auth_view);
-       gtk_widget_show (check_caption);
 }
 
 static void