X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-settings-dialog.c;h=e3dbef140e923d7383df7ddc1fe370507458af7e;hb=90ff729ad8d144bdfe7665aa0426c5a2c6e13bc9;hp=765289c0097649ec16476c12ad1ccac07168d25c;hpb=6279ccd0139ce0f62c7fafff71140e925f248621;p=modest diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c index 765289c..e3dbef1 100644 --- a/src/maemo/modest-account-settings-dialog.c +++ b/src/maemo/modest-account-settings-dialog.c @@ -50,13 +50,16 @@ #include "modest-account-mgr.h" #include "modest-account-mgr-helpers.h" /* For modest_account_mgr_get_account_data(). */ #include "modest-runtime.h" /* For modest_runtime_get_account_mgr(). */ +#include "modest-protocol-info.h" #include "maemo/modest-connection-specific-smtp-window.h" #include "maemo/modest-signature-editor-dialog.h" +#include "maemo/modest-maemo-utils.h" #include "widgets/modest-ui-constants.h" #include #include #include +#include #include #include /* For strlen(). */ @@ -212,12 +215,11 @@ static GtkWidget* create_caption_new_with_asterisk(ModestAccountSettingsDialog * GtkWidget *icon, HildonCaptionStatus flag) { - GtkWidget *caption = hildon_caption_new (group, value, control, icon, flag); + GtkWidget *caption = NULL; -/* The translated strings seem to already contain the *, - * but this code can be used if that is not true in future. - */ -#if 0 + /* Note: Previously, the translated strings already contained the "*", + * Comment out this code if they do again. + */ /* Add a * character to indicate mandatory fields, * as specified in our "Email UI Specification": */ if (flag == HILDON_CAPTION_MANDATORY) { @@ -227,7 +229,6 @@ static GtkWidget* create_caption_new_with_asterisk(ModestAccountSettingsDialog * } else caption = hildon_caption_new (group, value, control, icon, flag); -#endif /* Connect to the appropriate changed signal for the widget, * so we can ask for the prev/next buttons to be enabled/disabled appropriately: @@ -496,8 +497,14 @@ static void update_incoming_server_title (ModestAccountSettingsDialog *self, Mod * because the compiler does not know that the translated string will have a %s in it. * I do not see a way to avoid the warning while still using these Logical IDs. murrayc. */ gchar* incomingserver_title = g_strdup_printf(_("mcen_li_emailsetup_servertype"), type); - g_object_set (G_OBJECT (self->caption_incoming), "label", incomingserver_title, NULL); - g_free(incomingserver_title); + + /* This is a mandatory field, so add a *. This is usually done by + * create_caption_new_with_asterisk() but we can't use that here. */ + gchar *with_asterisk = g_strconcat (incomingserver_title, "*", NULL); + g_free (incomingserver_title); + + g_object_set (G_OBJECT (self->caption_incoming), "label", with_asterisk, NULL); + g_free(with_asterisk); } /** Change the caption title for the incoming server, @@ -741,6 +748,7 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) * and modest_serversecurity_combo_box_set_active_serversecurity(). */ if (!self->combo_outgoing_security) + self->combo_outgoing_security = GTK_WIDGET (modest_serversecurity_combo_box_new ()); caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"), self->combo_outgoing_security, NULL, HILDON_CAPTION_OPTIONAL); @@ -829,11 +837,12 @@ check_data (ModestAccountSettingsDialog *self) if (!modest_text_utils_validate_email_address (email_address)) { /* Warn the user via a dialog: */ - show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email")); + /*show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));*/ + hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_email")); - /* Return focus to the email address entry: */ - gtk_widget_grab_focus (self->entry_user_email); - + /* Return focus to the email address entry: */ + gtk_widget_grab_focus (self->entry_user_email); + gtk_editable_select_region (GTK_EDITABLE (self->entry_user_email), 0, -1); return FALSE; } @@ -875,14 +884,16 @@ on_response (GtkDialog *wizard_dialog, if (prevent_response) { /* This is a nasty hack. murrayc. */ /* Don't let the dialog close */ - g_signal_stop_emission_by_name (wizard_dialog, "response"); + g_signal_stop_emission_by_name (wizard_dialog, "response"); return; } if (response_id == GTK_RESPONSE_OK) { - /* Try to save the changes: */ - const gboolean saved = save_configuration (self); - if (saved) { + /* Try to save the changes if modified (NB #59251): */ + if (self->modified) + { + const gboolean saved = save_configuration (self); + if (saved) { /* Do not show the account-saved dialog if we are just saving this * temporarily, because from the user's point of view it will not * really be saved (saved + enabled) until later. @@ -891,9 +902,10 @@ on_response (GtkDialog *wizard_dialog, modest_account_mgr_get_enabled (self->account_manager, self->account_name); if (enabled) show_ok (GTK_WINDOW (self), _("mcen_ib_advsetup_settings_saved")); + } + else + show_error (GTK_WINDOW (self), _("mail_ib_setting_failed")); } - else - show_error (GTK_WINDOW (self), _("mail_ib_setting_failed")); } } @@ -904,9 +916,6 @@ modest_account_settings_dialog_init (ModestAccountSettingsDialog *self) * Each page of the notebook will be a page of the wizard: */ GtkNotebook *notebook = GTK_NOTEBOOK (gtk_notebook_new()); - - gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_emailsetup")); - /* Get the account manager object, * so we can check for existing accounts, * and create new accounts: */ @@ -1036,7 +1045,8 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo } else { gtk_widget_show (dialog->caption_leave_messages); } - + + update_incoming_server_security_choices (dialog, incoming_account->proto); if (incoming_account) { /* Remember this for later: */ dialog->incoming_protocol = incoming_account->proto; @@ -1053,21 +1063,33 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo * If secure authentication is unchecked, allow sending username and password also as plain text. * If secure authentication is checked, require one of the secure methods during connection: SSL, TLS, CRAM-MD5 etc. * TODO: Do we need to discover which of these (SSL, TLS, CRAM-MD5) is supported? - */ - const ModestAuthProtocol secure_auth = modest_server_account_get_secure_auth( - dialog->account_manager, incoming_account->account_name); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth), - secure_auth != MODEST_PROTOCOL_AUTH_PASSWORD); - /* Note that MODEST_PROTOCOL_AUTH_PLAIN should probably never be used. */ - - update_incoming_server_title (dialog, incoming_account->proto); - update_incoming_server_security_choices (dialog, incoming_account->proto); - + */ const ModestConnectionProtocol security = modest_server_account_get_security ( dialog->account_manager, incoming_account->account_name); modest_serversecurity_combo_box_set_active_serversecurity ( MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security), security); + /* Check if we have + - a secure protocol + OR + - use encrypted passwords + */ + const ModestAuthProtocol secure_auth = modest_server_account_get_secure_auth( + dialog->account_manager, incoming_account->account_name); + if (modest_protocol_info_is_secure(security) || + modest_protocol_info_auth_is_secure(secure_auth)) + { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth), + TRUE); + } + else + { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth), + FALSE); + }; + + update_incoming_server_title (dialog, incoming_account->proto); + const gint port_num = modest_account_mgr_get_int (dialog->account_manager, incoming_account->account_name, MODEST_ACCOUNT_PORT, TRUE /* server account */); @@ -1134,7 +1156,21 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo GTK_TOGGLE_BUTTON (dialog->checkbox_outgoing_smtp_specific), has_specific); } - + + /* Set window title according to account: */ + /* TODO: Is this the correct way to find a human-readable name for + * the protocol used? */ + const gchar* proto_str = modest_protocol_info_get_transport_store_protocol_name (dialog->incoming_protocol); + gchar *proto_name = g_utf8_strup(proto_str, -1); + gchar *account_title = modest_account_mgr_get_display_name(dialog->account_manager, account_name); + + gchar *title = g_strdup_printf(_("mcen_ti_account_settings"), proto_name, account_title); + g_free (proto_name); + g_free (account_title); + + gtk_window_set_title (GTK_WINDOW (dialog), title); + g_free (title); + /* account_data->is_enabled, */ /*account_data->is_default, */ @@ -1146,9 +1182,6 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo dialog->modified = FALSE; } -static GList* get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto, - const gchar* hostname, gint port, GtkWindow *parent_window); - static gboolean save_configuration (ModestAccountSettingsDialog *dialog) { @@ -1225,32 +1258,54 @@ save_configuration (ModestAccountSettingsDialog *dialog) * If secure authentication is unchecked, allow sending username and password also as plain text. * If secure authentication is checked, require one of the secure methods during connection: SSL, TLS, CRAM-MD5 etc. */ - ModestAuthProtocol protocol_authentication_incoming = - MODEST_PROTOCOL_AUTH_PASSWORD; - if (gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth))) { - GList *list_auth_methods = - get_supported_secure_authentication_methods (dialog->incoming_protocol, - hostname, port_num, GTK_WINDOW (dialog)); - if (list_auth_methods) { - /* Use the first supported method. - * TODO: Should we prioritize them, to prefer a particular one? */ - protocol_authentication_incoming = - (ModestAuthProtocol)(GPOINTER_TO_INT(list_auth_methods->data)); - g_list_free (list_auth_methods); - } - else - g_warning ("%s: get_supported_secure_authentication_methods() returned NULL.\n", __FUNCTION__); - - } - - modest_server_account_set_secure_auth (dialog->account_manager, incoming_account_name, protocol_authentication_incoming); - const ModestConnectionProtocol protocol_security_incoming = modest_serversecurity_combo_box_get_active_serversecurity ( MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security)); modest_server_account_set_security (dialog->account_manager, incoming_account_name, protocol_security_incoming); + ModestAuthProtocol protocol_authentication_incoming = + MODEST_PROTOCOL_AUTH_PASSWORD; + /* If we use an encrypted protocol then there is no need to encrypt the password */ + if (!modest_protocol_info_is_secure(protocol_security_incoming)) + { + if (gtk_toggle_button_get_active ( + GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth))) { + GList *list_auth_methods = + modest_maemo_utils_get_supported_secure_authentication_methods (dialog->incoming_protocol, + hostname, port_num, GTK_WINDOW (dialog)); + if (list_auth_methods) { + /* Use the first supported method. + * TODO: Should we prioritize them, to prefer a particular one? */ + GList* method; + for (method = list_auth_methods; method != NULL; method = g_list_next(method)) + { + ModestAuthProtocol proto = (ModestAuthProtocol)(GPOINTER_TO_INT(list_auth_methods->data)); + // Allow secure methods, e.g MD5 only + if (modest_protocol_info_auth_is_secure(proto)) + { + protocol_authentication_incoming = proto; + break; + } + } + g_list_free (list_auth_methods); + } + if (list_auth_methods == NULL || + !modest_protocol_info_auth_is_secure(protocol_authentication_incoming)) + { + GtkWidget* error_dialog = gtk_message_dialog_new(GTK_WINDOW(dialog), + GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, _("Server does not support secure authentication!")); + gtk_dialog_run(GTK_DIALOG(error_dialog)); + gtk_widget_destroy(error_dialog); + /* This is a nasty hack. jschmid. */ + /* Don't let the dialog close */ + g_signal_stop_emission_by_name (dialog, "response"); + return FALSE; + } + } + } + + modest_server_account_set_secure_auth (dialog->account_manager, incoming_account_name, protocol_authentication_incoming); g_free (incoming_account_name); @@ -1387,171 +1442,9 @@ show_error (GtkWindow *parent_window, const gchar* text) static void show_ok (GtkWindow *parent_window, const gchar* text) { - GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text)); - /* - GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window, - (GtkDialogFlags)0, - GTK_MESSAGE_INFO, - GTK_BUTTONS_OK, - text )); - */ - - gtk_dialog_run (dialog); - gtk_widget_destroy (GTK_WIDGET (dialog)); -} - -/* TODO: Enable this when tinymail has the API: */ -#if 0 -typedef struct -{ - gboolean finished; - GList *result; -} ModestGetSupportedAuthInfo; - -static void on_camel_account_get_supported_secure_authentication_status ( - GObject *self, TnyStatus *status, gpointer user_data) -{ - printf ("DEBUG: %s.\n", __FUNCTION__); -} - -static void -on_camel_account_get_supported_secure_authentication ( - TnyCamelAccount *self, gboolean cancelled, - GList *auth_types, GError **err, - gpointer user_data) -{ - printf ("DEBUG: %s.\n", __FUNCTION__); - - ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data; - g_return_if_fail (info); - - if (!auth_types) { - printf ("DEBUG: %s: auth_types is NULL.\n", __FUNCTION__); - info->finished = TRUE; /* We are blocking, waiting for this. */ - return; - } - - ModestPairList* pairs = modest_protocol_info_get_protocol_auth_pair_list (); - - /* Get the enum value for the strings: */ - GList *result = NULL; - GList* iter = auth_types; - while (iter) { - const gchar *auth_name = (const gchar*)iter->data; - printf("DEBUG: %s: auth_name=%s\n", __FUNCTION__, auth_name); - ModestPair *matching = modest_pair_list_find_by_first_as_string (pairs, - auth_name); - if (matching) - g_list_append (result, GINT_TO_POINTER((ModestConnectionProtocol)matching->second)); - - iter = g_list_next (iter); - } - - g_list_free (auth_types); - - modest_pair_list_free (pairs); - - info->result = result; - info->finished = TRUE; /* We are blocking, waiting for this. */ -} -#endif - - -static GList* get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto, - const gchar* hostname, gint port, GtkWindow *parent_window) -{ - return NULL; - -/* TODO: Enable this when tinymail has the API: */ -#if 0 - g_return_val_if_fail (proto != MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN, NULL); - - /* - result = g_list_append (result, GINT_TO_POINTER (MODEST_PROTOCOL_AUTH_CRAMMD5)); - */ - - /* Create a TnyCamelAccount so we can use - * tny_camel_account_get_supported_secure_authentication(): */ - TnyAccount * tny_account = NULL; - switch (proto) { - case MODEST_PROTOCOL_TRANSPORT_SENDMAIL: - case MODEST_PROTOCOL_TRANSPORT_SMTP: - tny_account = TNY_ACCOUNT(tny_camel_transport_account_new ()); break; - case MODEST_PROTOCOL_STORE_POP: - tny_account = TNY_ACCOUNT(tny_camel_pop_store_account_new ()); break; - case MODEST_PROTOCOL_STORE_IMAP: - tny_account = TNY_ACCOUNT(tny_camel_imap_store_account_new ()); break; - case MODEST_PROTOCOL_STORE_MAILDIR: - case MODEST_PROTOCOL_STORE_MBOX: - tny_account = TNY_ACCOUNT(tny_camel_store_account_new()); break; - default: - tny_account = NULL; - } - - if (!tny_account) { - g_printerr ("%s could not create tny account.", __FUNCTION__); - return NULL; - } - - /* Set proto, so that the prepare_func() vfunc will work when we call - * set_session(): */ - /* TODO: Why isn't this done in account_new()? */ - tny_account_set_proto (tny_account, - modest_protocol_info_get_transport_store_protocol_name(proto)); - - /* Set the session for the account, so we can use it: */ - ModestTnyAccountStore *account_store = modest_runtime_get_account_store (); - TnySessionCamel *session = - modest_tny_account_store_get_session (TNY_ACCOUNT_STORE (account_store)); - g_return_val_if_fail (session, NULL); - tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session); - - tny_account_set_hostname (tny_account, hostname); - - if(port > 0) - tny_account_set_port (tny_account, port); - - - /* Ask camel to ask the server, asynchronously: */ - ModestGetSupportedAuthInfo *info = g_slice_new (ModestGetSupportedAuthInfo); - info->finished = FALSE; - info->result = NULL; - - GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, - _("Asking the server for supported secure authentication mechanisms."))); - gtk_dialog_run (dialog); - - printf ("DEBUG: %s: STARTING.\n", __FUNCTION__); - tny_camel_account_get_supported_secure_authentication ( - TNY_CAMEL_ACCOUNT (tny_account), - on_camel_account_get_supported_secure_authentication, - on_camel_account_get_supported_secure_authentication_status, - info); - - printf ("DEBUG: %s: AFTER STARTING.\n", __FUNCTION__); - - /* Block until the callback has been called, - * driving the main context, so that the (idle handler) callback can be - * called, and so that our dialog is clickable: */ - while (!(info->finished)) { - printf ("DEBUG: %s: finished is FALSE.\n", __FUNCTION__); - if (g_main_context_pending (NULL)) { - printf ("DEBUG: iterating\n"); - g_main_context_iteration (NULL, FALSE); - printf ("DEBUG: after iterating\n"); - } - } - - printf ("DEBUG: %s: FINISHED.\n", __FUNCTION__); - - gtk_widget_destroy (GTK_WIDGET (dialog)); - - GList *result = info->result; - g_slice_free (ModestGetSupportedAuthInfo, info); - info = NULL; - - return result; -#endif + /* Don't show a dialog but Banner (NB #59248) */ + hildon_banner_show_information(GTK_WIDGET( + gtk_widget_get_parent_window(GTK_WIDGET(parent_window))), NULL, text); }