X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-maemo-security-options-view.c;h=0040156d47348f33af7f47fbf355b8ef7377a2fd;hb=591c8ef59dd9cb1ec95e77ac3fc9de1f9d94ccc0;hp=62867f61642332d9f93db5ee7f3f5d9b9bf1e451;hpb=31cd8a2a77f1c87e3c46bf318dca752f1cec513f;p=modest

diff --git a/src/hildon2/modest-maemo-security-options-view.c b/src/hildon2/modest-maemo-security-options-view.c
index 62867f6..0040156 100644
--- a/src/hildon2/modest-maemo-security-options-view.c
+++ b/src/hildon2/modest-maemo-security-options-view.c
@@ -45,6 +45,16 @@
 #define PORT_MIN 1
 #define PORT_MAX 65535
 
+typedef struct _ModestMaemoSecurityOptionsViewPrivate ModestMaemoSecurityOptionsViewPrivate;
+struct _ModestMaemoSecurityOptionsViewPrivate {
+	gboolean missing_data;
+};
+
+#define MODEST_MAEMO_SECURITY_OPTIONS_VIEW_GET_PRIVATE(o) \
+	(G_TYPE_INSTANCE_GET_PRIVATE((o), \
+				     MODEST_TYPE_MAEMO_SECURITY_OPTIONS_VIEW, \
+				     ModestMaemoSecurityOptionsViewPrivate))
+
 static void modest_maemo_security_options_view_init (ModestMaemoSecurityOptionsView *obj);
 static void modest_maemo_security_options_view_finalize (GObject *obj);
 static void modest_maemo_security_options_view_class_init (ModestMaemoSecurityOptionsViewClass *klass);
@@ -164,13 +174,13 @@ create_incoming_security (ModestSecurityOptionsView* self,
 	                  G_CALLBACK (on_security_changed), self);
 
 	/* Pack into container */
-	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);
 	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,
-			    FALSE, FALSE, MODEST_MARGIN_HALF);
+	gtk_box_pack_start (GTK_BOX (self), ppriv->security_view,
+			    FALSE, FALSE, 0);
 
 	/* Show widgets */
 	if (ppriv->full) {
@@ -199,32 +209,47 @@ on_entry_changed (GtkEditable *editable,
 		  gpointer user_data)
 {
 	ModestSecurityOptionsView* self;
+	ModestMaemoSecurityOptionsViewPrivate *priv;
  	ModestSecurityOptionsViewPrivate *ppriv;
 	ModestProtocolType auth_proto;
 	ModestSecureauthPicker *picker;
-	gboolean is_secure, missing;
+	gboolean is_secure;
 	ModestProtocolRegistry *protocol_registry;
 
 	self = MODEST_SECURITY_OPTIONS_VIEW (user_data);
+	priv = MODEST_MAEMO_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
 	ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
 	protocol_registry = modest_runtime_get_protocol_registry ();
 
 	/* Outgoing username is mandatory if outgoing auth is secure */
 	picker = MODEST_SECUREAUTH_PICKER (ppriv->auth_view);
 	auth_proto = modest_secureauth_picker_get_active_secureauth (picker);
-	is_secure = modest_protocol_registry_protocol_type_is_secure (protocol_registry, 
+	is_secure = modest_protocol_registry_protocol_type_is_secure (protocol_registry,
 								      auth_proto);
 
-	if (is_secure && 
+	if (is_secure &&
 	    !g_ascii_strcasecmp (hildon_entry_get_text (HILDON_ENTRY (ppriv->user_entry)), "")) {
-		missing = TRUE;
+		priv->missing_data = TRUE;
 	} else {
-		missing = FALSE;
+		priv->missing_data = FALSE;
 	}
-	
+
+	if (!priv->missing_data &&
+	    ppriv->full &&
+	    !modest_number_editor_is_valid (MODEST_NUMBER_EDITOR (ppriv->port_view)))
+		priv->missing_data = TRUE;
+
 	/* Emit a signal to notify if mandatory data is missing */
-	g_signal_emit_by_name (G_OBJECT (self), "missing_mandatory_data", 
-			       missing, NULL);
+	g_signal_emit_by_name (G_OBJECT (self), "missing_mandatory_data",
+			       priv->missing_data, NULL);
+}
+
+void
+on_valid_changed (ModestNumberEditor *editor,
+		  gboolean valid,
+		  ModestSecurityOptionsView *self)
+{
+	on_entry_changed (NULL, (gpointer) self);
 }
 
 static void
@@ -313,6 +338,8 @@ create_outgoing_security (ModestSecurityOptionsView* self,
 				  G_CALLBACK (on_auth_changed), self);
 		g_signal_connect (G_OBJECT (ppriv->user_entry), "changed",
 				  G_CALLBACK (on_entry_changed), self);
+		g_signal_connect (G_OBJECT (ppriv->port_view), "valid-changed",
+					    G_CALLBACK (on_valid_changed), self);
 	}
 
 	/* Initialize widgets */
@@ -331,9 +358,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 */
@@ -372,8 +398,18 @@ modest_maemo_security_options_view_new  (ModestSecurityOptionsType type,
 	return (GtkWidget *) self;
 }
 
-static void 
-modest_maemo_security_options_view_load_settings (ModestSecurityOptionsView* self, 
+gboolean
+modest_security_options_view_has_missing_mandatory_data (ModestSecurityOptionsView* self)
+{
+ 	ModestMaemoSecurityOptionsViewPrivate *priv;
+
+	priv = MODEST_MAEMO_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
+
+	return priv->missing_data;
+}
+
+static void
+modest_maemo_security_options_view_load_settings (ModestSecurityOptionsView* self,
 						  ModestAccountSettings *settings)
 {
  	ModestSecurityOptionsViewPrivate *ppriv;
@@ -479,6 +515,7 @@ modest_maemo_security_options_view_class_init (ModestMaemoSecurityOptionsViewCla
 
 	modest_maemo_security_options_view_parent_class = g_type_class_peek_parent (klass);
 
+	g_type_class_add_private (gobject_class, sizeof (ModestMaemoSecurityOptionsViewPrivate));
 	gobject_class->finalize = modest_maemo_security_options_view_finalize;
 
 	MODEST_SECURITY_OPTIONS_VIEW_CLASS (klass)->load_settings =