X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-maemo-security-options-view.c;h=4b6ffa648d83a198bf48a8c66cc76ef92bc2133c;hb=f72625d1ed94546d9c8bc8cdaffab6fa1a88f854;hp=3b6ee8cbb075ff356e6cdb7b167d9fda95ff5b77;hpb=733195be2097c3663a10e2e1e097fa6d37eb6306;p=modest

diff --git a/src/hildon2/modest-maemo-security-options-view.c b/src/hildon2/modest-maemo-security-options-view.c
index 3b6ee8c..4b6ffa6 100644
--- a/src/hildon2/modest-maemo-security-options-view.c
+++ b/src/hildon2/modest-maemo-security-options-view.c
@@ -172,11 +172,13 @@ create_incoming_security (ModestSecurityOptionsView* self,
 
 	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);
+		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);
@@ -285,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
@@ -309,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 */	
@@ -345,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 */