X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-maemo-security-options-view.c;h=0040156d47348f33af7f47fbf355b8ef7377a2fd;hb=04691c42117fd68177b047f77e321321aa5e1260;hp=41e55d9fb03ecf030c0787d636cf052e9a247bf0;hpb=8d4844a81a6d20c97f8916fd6a6a0e384d995ded;p=modest diff --git a/src/hildon2/modest-maemo-security-options-view.c b/src/hildon2/modest-maemo-security-options-view.c index 41e55d9..0040156 100644 --- a/src/hildon2/modest-maemo-security-options-view.c +++ b/src/hildon2/modest-maemo-security-options-view.c @@ -38,13 +38,23 @@ #include "modest-serversecurity-picker.h" #include "modest-secureauth-picker.h" #include "modest-maemo-utils.h" -#include +#include #include #include "modest-hildon-includes.h" #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); @@ -89,7 +99,7 @@ on_security_changed (GtkWidget *widget, modest_serversecurity_picker_get_active_serversecurity_port (MODEST_SERVERSECURITY_PICKER (ppriv->security_view)); if(port_number) { - hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->port_view), + modest_number_editor_set_value (MODEST_NUMBER_EDITOR (ppriv->port_view), port_number); } } @@ -147,10 +157,11 @@ create_incoming_security (ModestSecurityOptionsView* self, ppriv->security_view); if (ppriv->full) { - ppriv->port_view = GTK_WIDGET (hildon_number_editor_new (PORT_MIN, PORT_MAX)); + 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); } @@ -163,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) { @@ -198,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 && - !g_ascii_strcasecmp (gtk_entry_get_text (GTK_ENTRY (ppriv->user_entry)), "")) { - missing = TRUE; + if (is_secure && + !g_ascii_strcasecmp (hildon_entry_get_text (HILDON_ENTRY (ppriv->user_entry)), "")) { + 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 @@ -268,7 +294,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); @@ -281,7 +308,7 @@ create_outgoing_security (ModestSecurityOptionsView* self, on_entry_max, self); /* Password widgets */ - ppriv->pwd_entry = gtk_entry_new (); + ppriv->pwd_entry = hildon_entry_new (MODEST_EDITABLE_SIZE); /* Auto-capitalization is the default, so let's turn it off */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (ppriv->pwd_entry), @@ -292,12 +319,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 (hildon_number_editor_new (PORT_MIN, PORT_MAX)); + 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); } @@ -309,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 */ @@ -327,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 */ @@ -368,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; @@ -391,7 +431,7 @@ modest_maemo_security_options_view_load_settings (ModestSecurityOptionsView* sel } else if (ppriv->full) { /* Keep the user-entered port-number, or the * already-appropriate automatic port number */ - hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->port_view), + modest_number_editor_set_value (MODEST_NUMBER_EDITOR (ppriv->port_view), port_number); } /* Frees */ @@ -414,7 +454,7 @@ modest_maemo_security_options_view_save_settings (ModestSecurityOptionsView* sel server_settings = modest_account_settings_get_transport_settings (settings); if (ppriv->full) { - server_port = hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (ppriv->port_view)); + server_port = modest_number_editor_get_value (MODEST_NUMBER_EDITOR (ppriv->port_view)); } else { server_port = modest_serversecurity_picker_get_active_serversecurity_port (MODEST_SERVERSECURITY_PICKER (ppriv->security_view)); } @@ -445,7 +485,7 @@ modest_maemo_security_options_view_changed (ModestSecurityOptionsView* self, server_settings = modest_account_settings_get_transport_settings (settings); server_port = - hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (ppriv->port_view)); + modest_number_editor_get_value (MODEST_NUMBER_EDITOR (ppriv->port_view)); /* Frees */ g_object_unref (server_settings); @@ -475,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 =