* Fixed an invalid free in the easysetup dialog

[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 7ef6dfb..01fd898 100644 (file)
--- a/src/hildon2/modest-maemo-security-options-view.c
+++ b/src/hildon2/modest-maemo-security-options-view.c
@@ -151,6 +151,7 @@ create_incoming_security (ModestSecurityOptionsView* self,
                entry_caption = modest_maemo_utils_create_captioned (title_size_group,
                                                                     value_size_group,
                                                                     _("mcen_fi_emailsetup_port"), 
+                                                                    FALSE,
                                                                     ppriv->port_view);
        }
 
@@ -163,12 +164,12 @@ create_incoming_security (ModestSecurityOptionsView* self,
                          G_CALLBACK (on_security_changed), self);
 
        /* Pack into container */
-       gtk_box_pack_start (GTK_BOX (self), ppriv->security_view,
+       gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view,
                            FALSE, FALSE, MODEST_MARGIN_HALF);
        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->auth_view,
+       gtk_box_pack_start (GTK_BOX (self), ppriv->security_view,
                            FALSE, FALSE, MODEST_MARGIN_HALF);
 
        /* Show widgets */
@@ -268,7 +269,8 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                user_label = g_strdup_printf("%s*", _("mail_fi_username"));
                user_caption = modest_maemo_utils_create_captioned (title_size_group,
                                                                    value_size_group,
-                                                                   user_label, 
+                                                                   user_label,
+                                                                   FALSE,
                                                                    ppriv->user_entry);
                g_free (user_label);
        
@@ -292,12 +294,14 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                pwd_caption = modest_maemo_utils_create_captioned (title_size_group,
                                                                   value_size_group,
                                                                   _("mail_fi_password"), 
+                                                                  FALSE,
                                                                   ppriv->pwd_entry);
 
                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);
        }
 
@@ -327,9 +331,8 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                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);
        } else {
-               /* The order is different */
-               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, MODEST_MARGIN_HALF);
+               gtk_box_pack_start (GTK_BOX (self), ppriv->security_view, FALSE, FALSE, MODEST_MARGIN_HALF);
        }
 
        /* Show widgets */