From: Sergio Villar Senín Date: Tue, 5 May 2009 08:20:25 +0000 (+0200) Subject: Fixes NB#114517, "save" button should be dimmed if there is no username when smtp... X-Git-Tag: 3.0.16-rc1~4 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=4fda51ad4fd87952deef84366884dff6a7c447fd Fixes NB#114517, "save" button should be dimmed if there is no username when smtp security is set to login --- diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c index 8a61537..5ff7572 100644 --- a/src/hildon2/modest-default-account-settings-dialog.c +++ b/src/hildon2/modest-default-account-settings-dialog.c @@ -1423,10 +1423,11 @@ enable_buttons (ModestDefaultAccountSettingsDialog *self) { gboolean enable_ok = TRUE; ModestProtocolRegistry *protocol_registry; + ModestSecurityOptionsView *sec_view; ModestDefaultAccountSettingsDialogPrivate *priv; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); - + /* The account details title is mandatory: */ if (entry_is_empty(priv->entry_account_title)) enable_ok = FALSE; @@ -1434,7 +1435,7 @@ enable_buttons (ModestDefaultAccountSettingsDialog *self) /* The user details username is mandatory: */ if (enable_ok && entry_is_empty(priv->entry_user_username)) enable_ok = FALSE; - + /* The user details email address is mandatory: */ if (enable_ok && entry_is_empty (priv->entry_user_email)) enable_ok = FALSE; @@ -1443,12 +1444,22 @@ enable_buttons (ModestDefaultAccountSettingsDialog *self) if (enable_ok && entry_is_empty(priv->entry_incomingserver)) enable_ok = FALSE; + sec_view = MODEST_SECURITY_OPTIONS_VIEW (priv->incoming_security); + if (enable_ok && + modest_security_options_view_has_missing_mandatory_data (sec_view)) + enable_ok = FALSE; + /* The custom outgoing server is mandatory: */ if (enable_ok && entry_is_empty(priv->entry_outgoingserver)) enable_ok = FALSE; + sec_view = MODEST_SECURITY_OPTIONS_VIEW (priv->outgoing_security); + if (enable_ok && + modest_security_options_view_has_missing_mandatory_data (sec_view)) + enable_ok = FALSE; + protocol_registry = modest_runtime_get_protocol_registry (); - + /* Enable the buttons, * identifying them via their associated response codes: */ diff --git a/src/hildon2/modest-maemo-security-options-view.c b/src/hildon2/modest-maemo-security-options-view.c index 65bf10c..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); @@ -199,35 +209,39 @@ 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 (!missing && ppriv->full && !modest_number_editor_is_valid (MODEST_NUMBER_EDITOR (ppriv->port_view))) - missing = TRUE; - + 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 @@ -384,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; @@ -491,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 = diff --git a/src/maemo/modest-maemo-security-options-view.c b/src/maemo/modest-maemo-security-options-view.c index 8593897..19e0853 100644 --- a/src/maemo/modest-maemo-security-options-view.c +++ b/src/maemo/modest-maemo-security-options-view.c @@ -51,6 +51,7 @@ typedef struct _ModestMaemoSecurityOptionsViewPrivate ModestMaemoSecurityOptionsViewPrivate; struct _ModestMaemoSecurityOptionsViewPrivate { + gboolean missing_data; }; #define MODEST_MAEMO_SECURITY_OPTIONS_VIEW_GET_PRIVATE(o) \ @@ -208,32 +209,34 @@ on_entry_changed (GtkEditable *editable, gpointer user_data) { ModestSecurityOptionsView* self; + ModestMaemoSecurityOptionsViewPrivate *priv; ModestSecurityOptionsViewPrivate *ppriv; ModestProtocolType auth_proto; ModestSecureauthComboBox *combo; - 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 */ combo = MODEST_SECUREAUTH_COMBO_BOX (ppriv->auth_view); auth_proto = modest_secureauth_combo_box_get_active_secureauth (combo); - 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 (gtk_entry_get_text (GTK_ENTRY (ppriv->user_entry)), "")) { - missing = TRUE; + priv->missing_data = TRUE; } else { - missing = FALSE; + priv->missing_data = FALSE; } - + /* 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); } static void @@ -457,6 +460,16 @@ modest_maemo_security_options_view_changed (ModestSecurityOptionsView* self, return FALSE; } +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_init (ModestMaemoSecurityOptionsView *obj) { diff --git a/src/widgets/modest-security-options-view.h b/src/widgets/modest-security-options-view.h index 377ac20..fbd63e7 100644 --- a/src/widgets/modest-security-options-view.h +++ b/src/widgets/modest-security-options-view.h @@ -106,6 +106,9 @@ void modest_security_options_view_enable_changes (ModestSecurityOptionsView* sel **/ gboolean modest_security_options_view_auth_check (ModestSecurityOptionsView* self); +gboolean modest_security_options_view_has_missing_mandatory_data (ModestSecurityOptionsView* self); + + G_END_DECLS #endif /* __MODEST_SECURITY_OPTIONS_VIEW_H__ */