Fixes NB#131187, no kinetic scrolling in message viewer

[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 0040156..4b6ffa6 100644 (file)
--- a/src/hildon2/modest-maemo-security-options-view.c
+++ b/src/hildon2/modest-maemo-security-options-view.c
@@ -151,44 +151,39 @@ create_incoming_security (ModestSecurityOptionsView* self,
                                                                             HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
        modest_serversecurity_picker_fill (MODEST_SERVERSECURITY_PICKER (ppriv->security_view), 
                                           modest_protocol_registry_get_pop_type_id ());
-       modest_maemo_utils_set_hbutton_layout (title_size_group, 
+       modest_maemo_utils_set_hbutton_layout (title_size_group,
                                               value_size_group,
                                               _("mcen_li_emailsetup_secure_connection"), 
                                               ppriv->security_view);
 
-       if (ppriv->full) {              
-               ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
-               entry_caption = modest_maemo_utils_create_captioned (title_size_group,
-                                                                    value_size_group,
-                                                                    _("mcen_fi_emailsetup_port"), 
-                                                                    FALSE,
-                                                                    ppriv->port_view);
-       }
-
        ppriv->auth_view = hildon_check_button_new (MODEST_EDITABLE_SIZE);
        gtk_button_set_label (GTK_BUTTON (ppriv->auth_view), _("mcen_li_emailsetup_secure_authentication"));
        gtk_button_set_alignment (GTK_BUTTON (ppriv->auth_view), 0.0, 0.5);
 
-       /* Track changes in UI */       
+       /* Track changes in UI */
        g_signal_connect (G_OBJECT (ppriv->security_view), "value-changed",
                          G_CALLBACK (on_security_changed), self);
 
-       /* Pack into container */
-       gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view,
-                           FALSE, FALSE, 0);
-       if (ppriv->full)
-               gtk_box_pack_start (GTK_BOX (self), entry_caption, 
-                                   FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_box_pack_start (GTK_BOX (self), ppriv->security_view,
-                           FALSE, FALSE, 0);
+       /* Pack into container & show */
+       gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (self), ppriv->security_view, FALSE, FALSE, 0);
+       gtk_widget_show (ppriv->security_view);
+       gtk_widget_show (ppriv->auth_view);
 
-       /* Show widgets */
        if (ppriv->full) {
+               ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
+               entry_caption =
+                       modest_maemo_utils_create_captioned_with_size_type (title_size_group,
+                                                                           value_size_group,
+                                                                           _("mcen_fi_emailsetup_port"),
+                                                                           FALSE,
+                                                                           ppriv->port_view,
+                                                                           MODEST_EDITABLE_SIZE);
+               /* Pack & show widgets */
+               gtk_box_pack_start (GTK_BOX (self), entry_caption, FALSE, FALSE, 0);
                gtk_widget_show (ppriv->port_view);
                gtk_widget_show (entry_caption);
        }
-       gtk_widget_show (ppriv->security_view);
-       gtk_widget_show (ppriv->auth_view);
 }
 
 static void
@@ -292,11 +287,12 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                                                 HILDON_GTK_INPUT_MODE_FULL);
 
                user_label = g_strdup_printf("%s*", _("mail_fi_username"));
-               user_caption = modest_maemo_utils_create_captioned (title_size_group,
-                                                                   value_size_group,
-                                                                   user_label,
-                                                                   FALSE,
-                                                                   ppriv->user_entry);
+               user_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group,
+                                                                                  value_size_group,
+                                                                                  user_label,
+                                                                                  FALSE,
+                                                                                  ppriv->user_entry,
+                                                                                  MODEST_EDITABLE_SIZE);
                g_free (user_label);
        
                /* Prevent the use of some characters. Limit the max
@@ -316,18 +312,22 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                                                 HILDON_GTK_INPUT_MODE_INVISIBLE);
                gtk_entry_set_visibility (GTK_ENTRY (ppriv->pwd_entry), FALSE);
 
-               pwd_caption = modest_maemo_utils_create_captioned (title_size_group,
-                                                                  value_size_group,
-                                                                  _("mail_fi_password"), 
-                                                                  FALSE,
-                                                                  ppriv->pwd_entry);
+               pwd_caption =
+                       modest_maemo_utils_create_captioned_with_size_type (title_size_group,
+                                                                           value_size_group,
+                                                                           _("mail_fi_password"),
+                                                                           FALSE,
+                                                                           ppriv->pwd_entry,
+                                                                           MODEST_EDITABLE_SIZE);
 
                ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
-               port_caption = modest_maemo_utils_create_captioned (title_size_group,
-                                                                   value_size_group,
-                                                                   _("mcen_fi_emailsetup_port"), 
-                                                                   FALSE,
-                                                                   ppriv->port_view);
+               port_caption =
+                       modest_maemo_utils_create_captioned_with_size_type (title_size_group,
+                                                                           value_size_group,
+                                                                           _("mcen_fi_emailsetup_port"),
+                                                                           FALSE,
+                                                                           ppriv->port_view,
+                                                                           MODEST_EDITABLE_SIZE);
        }
 
        /* Track changes in UI */       
@@ -352,14 +352,14 @@ create_outgoing_security (ModestSecurityOptionsView* self,
 
        /* Pack into container */
        if (ppriv->full) {
-               gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view, FALSE, FALSE, MODEST_MARGIN_HALF);
-               gtk_box_pack_start (GTK_BOX (self), user_caption, FALSE, FALSE, MODEST_MARGIN_HALF);
-               gtk_box_pack_start (GTK_BOX (self), pwd_caption, FALSE, FALSE, MODEST_MARGIN_HALF);
-               gtk_box_pack_start (GTK_BOX (self), ppriv->security_view, FALSE, FALSE, MODEST_MARGIN_HALF);
-               gtk_box_pack_start (GTK_BOX (self), port_caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+               gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view, FALSE, FALSE, 0);
+               gtk_box_pack_start (GTK_BOX (self), user_caption, FALSE, FALSE, 0);
+               gtk_box_pack_start (GTK_BOX (self), pwd_caption, FALSE, FALSE, 0);
+               gtk_box_pack_start (GTK_BOX (self), ppriv->security_view, FALSE, FALSE, 0);
+               gtk_box_pack_start (GTK_BOX (self), port_caption, FALSE, FALSE, 0);
        } else {
-               gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view, FALSE, FALSE, MODEST_MARGIN_HALF);
-               gtk_box_pack_start (GTK_BOX (self), ppriv->security_view, FALSE, FALSE, MODEST_MARGIN_HALF);
+               gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view, FALSE, FALSE, 0);
+               gtk_box_pack_start (GTK_BOX (self), ppriv->security_view, FALSE, FALSE, 0);
        }
 
        /* Show widgets */