#include "modest-protocol-info.h"
#include "maemo/modest-connection-specific-smtp-window.h"
#include "maemo/modest-signature-editor-dialog.h"
+#include <modest-utils.h>
#include "maemo/modest-maemo-utils.h"
#include "widgets/modest-ui-constants.h"
-
-#include <tny-camel-transport-account.h>
-#include <tny-camel-imap-store-account.h>
-#include <tny-camel-pop-store-account.h>
+#include <tny-account.h>
#include <tny-status.h>
#include <gconf/gconf-client.h>
#include <config.h>
#endif
-#define EXAMPLE_EMAIL_ADDRESS "first.last@provider.com"
-
#define PORT_MIN 1
#define PORT_MAX 65535
static gboolean
save_configuration (ModestAccountSettingsDialog *dialog);
+static const gchar * null_means_empty (const gchar * str);
+
+static const gchar *
+null_means_empty (const gchar * str)
+{
+ return str ? str : "";
+}
+
+
static void
modest_account_settings_dialog_get_property (GObject *object, guint property_id,
GValue *value, GParamSpec *pspec)
if (self->account_manager)
g_object_unref (G_OBJECT (self->account_manager));
- if (self->specific_window)
- gtk_widget_destroy (self->specific_window);
-
if (self->signature_dialog)
gtk_widget_destroy (self->signature_dialog);
+
+ if (self->settings) {
+ g_object_unref (self->settings);
+ self->settings = NULL;
+ }
G_OBJECT_CLASS (modest_account_settings_dialog_parent_class)->finalize (object);
}
static void
-show_error (GtkWidget *parent_widget, const gchar* text);
-
-static void
on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data);
static void
self->modified = TRUE;
}
+static void
+on_number_editor_notify (HildonNumberEditor *editor, GParamSpec *arg1, gpointer user_data)
+{
+ ModestAccountSettingsDialog *dialog = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ gint value = hildon_number_editor_get_value (editor);
+
+ gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, value > 0);
+}
+
/* Set a modified boolean whenever the widget is changed,
* so we can check for it later.
*/
if (HILDON_IS_NUMBER_EDITOR (widget)) {
g_signal_connect (G_OBJECT (widget), "notify::value",
G_CALLBACK (on_modified_number_editor_changed), self);
+ g_signal_connect (G_OBJECT (widget), "notify", G_CALLBACK (on_number_editor_notify), self);
}
else if (GTK_IS_ENTRY (widget)) {
g_signal_connect (G_OBJECT (widget), "changed",
static void
on_entry_invalid_account_title_character (ModestValidatingEntry *self, const gchar* character, gpointer user_data)
{
- gchar *message = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"),
- "\\ / : * ? \" < > | ^");
- show_error (GTK_WIDGET (self), message);
+ gchar *tmp, *msg;
+
+ tmp = g_strndup (account_title_forbidden_chars, ACCOUNT_TITLE_FORBIDDEN_CHARS_LENGTH);
+ msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+
+ hildon_banner_show_information(GTK_WIDGET (self), NULL, msg);
+
+ g_free (msg);
+ g_free (tmp);
}
static void
on_entry_invalid_fullname_character (ModestValidatingEntry *self, const gchar* character, gpointer user_data)
{
- gchar *message = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"),
- "< >");
- show_error (GTK_WIDGET (self), message);
-}
+ gchar *tmp, *msg;
+
+ tmp = g_strndup (user_name_forbidden_chars, USER_NAME_FORBIDDEN_CHARS_LENGTH);
+ msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+
+ hildon_banner_show_information(GTK_WIDGET (self), NULL, msg);
+ g_free (msg);
+ g_free (tmp);
+}
static void
on_entry_max (ModestValidatingEntry *self, gpointer user_data)
{
- /* ModestAccountSettingsDialog *dialog = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); */
- show_error (GTK_WIDGET (self), _CS("ckdg_ib_maximum_characters_reached"));
+ hildon_banner_show_information(GTK_WIDGET (self), NULL,
+ _CS("ckdg_ib_maximum_characters_reached"));
}
static GtkWidget*
create_page_account_details (ModestAccountSettingsDialog *self)
{
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
- GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails"));
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (label);
+ GtkAdjustment *focus_adjustment = NULL;
/* Create a size group to be used by all captions.
* Note that HildonCaption does not create a default size group if we do not specify one.
* We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ GtkWidget *scrollwin = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
/* The description widgets: */
self->entry_account_title = GTK_WIDGET (modest_validating_entry_new ());
gtk_widget_show (GTK_WIDGET (box));
- return GTK_WIDGET (box);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwin), box);
+ gtk_widget_show (scrollwin);
+
+ focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin));
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), focus_adjustment);
+
+ return GTK_WIDGET (scrollwin);
}
static gchar*
on_button_signature (GtkButton *button, gpointer user_data)
{
ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-
+ gint response;
+
/* Create the window, if necessary: */
if (!(self->signature_dialog)) {
self->signature_dialog = GTK_WIDGET (modest_signature_editor_dialog_new ());
- gboolean use_signature = FALSE;
- gchar *signature = modest_account_mgr_get_signature(self->account_manager, self->account_name,
- &use_signature);
+ gboolean use_signature = modest_account_settings_get_use_signature (self->settings);
+ const gchar *signature = modest_account_settings_get_signature(self->settings);
gchar* account_title = get_entered_account_title (self);
modest_signature_editor_dialog_set_settings (
MODEST_SIGNATURE_EDITOR_DIALOG (self->signature_dialog),
use_signature, signature, account_title);
+
g_free (account_title);
account_title = NULL;
- g_free (signature);
signature = NULL;
}
/* Show the window: */
- gtk_window_set_transient_for (GTK_WINDOW (self->signature_dialog), GTK_WINDOW (self));
- gtk_window_set_modal (GTK_WINDOW (self->signature_dialog), TRUE);
- const gint response = gtk_dialog_run (GTK_DIALOG (self->signature_dialog));
- gtk_widget_hide (self->signature_dialog);
- if (response != GTK_RESPONSE_OK) {
- /* Destroy the widget now, and its data: */
- gtk_widget_destroy (self->signature_dialog);
- self->signature_dialog = NULL;
- }
- else {
- /* Mark modified, so we use the dialog's data later: */
- self->modified = TRUE;
- }
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+ GTK_WINDOW (self->signature_dialog));
+
+ response = gtk_dialog_run (GTK_DIALOG (self->signature_dialog));
+ gtk_widget_hide (self->signature_dialog);
+ if (response != GTK_RESPONSE_OK) {
+ /* Destroy the widget now, and its data: */
+ gtk_widget_destroy (self->signature_dialog);
+ self->signature_dialog = NULL;
+ } else {
+ /* Mark modified, so we use the dialog's data later: */
+ self->modified = TRUE;
+ }
}
static GtkWidget*
* as required by our UI specification: */
modest_validating_entry_set_unallowed_characters_whitespace (
MODEST_VALIDATING_ENTRY (self->entry_user_username));
+ modest_validating_entry_set_func (MODEST_VALIDATING_ENTRY (self->entry_user_username),
+ modest_maemo_utils_on_entry_invalid_character,
+ self);
/* Set max length as in the UI spec:
* The UI spec seems to want us to show a dialog if we hit the maximum. */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
caption = create_caption_new_with_asterisk (self, sizegroup,
_("mcen_li_emailsetup_email_address"), self->entry_user_email, NULL, HILDON_CAPTION_MANDATORY);
- gtk_entry_set_text (GTK_ENTRY (self->entry_user_email), EXAMPLE_EMAIL_ADDRESS); /* Default text. */
+ gtk_entry_set_text (GTK_ENTRY (self->entry_user_email), MODEST_EXAMPLE_EMAIL_ADDRESS); /* Default text. */
gtk_widget_show (self->entry_user_email);
connect_for_modified (self, self->entry_user_email);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data)
{
ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-
+ ModestConnectionSpecificSmtpWindow *smtp_win;
+
/* Create the window if necessary: */
- if (!(self->specific_window)) {
- self->specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
- modest_connection_specific_smtp_window_fill_with_connections (
- MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (self->specific_window), self->account_manager,
- self->account_name);
- }
+ smtp_win = modest_connection_specific_smtp_window_new ();
+ modest_connection_specific_smtp_window_fill_with_connections (smtp_win, self->account_manager);
/* Show the window: */
- gtk_window_set_transient_for (GTK_WINDOW (self->specific_window), GTK_WINDOW (self));
- gtk_window_set_modal (GTK_WINDOW (self->specific_window), TRUE);
- gtk_widget_show (self->specific_window);
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (smtp_win));
+ gtk_widget_show (GTK_WIDGET (smtp_win));
+ self->modified = TRUE;
}
static void
on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data)
{
ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ ModestConnectionProtocol protocol_security_incoming;
+ gint port_number;
- const gint port_number =
+ port_number =
modest_serversecurity_combo_box_get_active_serversecurity_port (
MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security));
hildon_number_editor_set_value (
HILDON_NUMBER_EDITOR (self->entry_incoming_port), port_number);
}
+
+ protocol_security_incoming = modest_serversecurity_combo_box_get_active_serversecurity (
+ MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security));
+ gtk_widget_set_sensitive (self->checkbox_incoming_auth, !modest_protocol_info_is_secure (protocol_security_incoming));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->checkbox_incoming_auth), modest_protocol_info_is_secure (protocol_security_incoming));
+
}
return GTK_WIDGET (scrollwin);
}
-
-
-/** TODO: This doesn't work because hildon_number_editor_get_value() does not work until
- * focus has been lost:
- * See https://bugs.maemo.org/show_bug.cgi?id=1806.
- */
-static gboolean
-check_hildon_number_editor_and_warn_value_not_in_range (HildonNumberEditor *widget, gint min, gint max)
-{
- g_return_val_if_fail (widget, FALSE);
-
- const gint port = hildon_number_editor_get_value (widget);
- /* printf ("DEBUG: %s, port=%d\n", __FUNCTION__, port); */
- if (port < PORT_MIN ||
- port > PORT_MAX) {
-
- /* Warn the user via a dialog: */
- /*show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));*/
- gchar *message = g_strdup_printf (_CS("ckct_ib_set_a_value_within_range"),
- min,
- max);
- hildon_banner_show_information (GTK_WIDGET (widget), NULL, message);
- g_free (message);
- message = NULL;
-
- /* Return focus to the email address entry: */
- gtk_widget_grab_focus (GTK_WIDGET (widget));
-
- return FALSE;
- }
-
- return TRUE;
-}
-
static gboolean
check_data (ModestAccountSettingsDialog *self)
if (!modest_text_utils_validate_email_address (email_address, NULL)) {
/* Warn the user via a dialog: */
- /*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: */
if (!modest_text_utils_validate_domain_name (hostname)) {
/* Warn the user via a dialog: */
- /*show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));*/
hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_servername"));
/* Return focus to the email address entry: */
if (!modest_text_utils_validate_domain_name (hostname2)) {
/* Warn the user via a dialog: */
- /*show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));*/
hildon_banner_show_information (self->entry_outgoingserver, NULL, _("mcen_ib_invalid_servername"));
/* Return focus to the email address entry: */
return FALSE;
}
- /* Check that the port numbers are acceptable: */
- if (!check_hildon_number_editor_and_warn_value_not_in_range (
- HILDON_NUMBER_EDITOR (self->entry_incoming_port), PORT_MIN, PORT_MAX)) {
- return FALSE;
- }
-
- if (!check_hildon_number_editor_and_warn_value_not_in_range (
- HILDON_NUMBER_EDITOR (self->entry_outgoing_port), PORT_MIN, PORT_MAX)) {
- return FALSE;
- }
-
-
/* Find a suitable authentication method when secure authentication is desired */
const gint port_num = hildon_number_editor_get_value (
const ModestConnectionProtocol protocol_security_incoming = modest_serversecurity_combo_box_get_active_serversecurity (
MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security));
-
- /* 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 (self->checkbox_incoming_auth))) {
GError *error = NULL;
+
GList *list_auth_methods =
- modest_maemo_utils_get_supported_secure_authentication_methods (self->incoming_protocol,
+ modest_utils_get_supported_secure_authentication_methods (self->incoming_protocol,
hostname, port_num, username, GTK_WINDOW (self), &error);
if (list_auth_methods) {
/* Use the first supported method.
GList* method;
for (method = list_auth_methods; method != NULL; method = g_list_next(method))
{
- ModestAuthProtocol proto = (ModestAuthProtocol)(GPOINTER_TO_INT(list_auth_methods->data));
+ ModestAuthProtocol proto = (ModestAuthProtocol)(GPOINTER_TO_INT(method->data));
// Allow secure methods, e.g MD5 only
if (modest_protocol_info_auth_is_secure(proto))
{
if (list_auth_methods == NULL ||
!modest_protocol_info_auth_is_secure(self->protocol_authentication_incoming))
{
- if(error == NULL || error->domain != modest_maemo_utils_get_supported_secure_authentication_error_quark() ||
- error->code != MODEST_MAEMO_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED)
- {
- show_error (GTK_WIDGET (self), _("Could not discover supported secure authentication methods."));
- }
+ if(error == NULL || error->domain != modest_utils_get_supported_secure_authentication_error_quark() ||
+ error->code != MODEST_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED)
+ hildon_banner_show_information(GTK_WIDGET (self), NULL,
+ _("mcen_ib_unableto_discover_auth_methods"));
if(error != NULL)
g_error_free(error);
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.
+ * really be saved (saved + enabled) until later
*/
- const gboolean enabled =
- modest_account_mgr_get_enabled (self->account_manager, self->account_name);
- if (enabled)
- show_error (NULL, _("mcen_ib_advsetup_settings_saved"));
+ if (modest_account_settings_get_account_name (self->settings) != NULL) {
+ ModestServerAccountSettings *store_settings;
+ ModestServerAccountSettings *transport_settings;
+ const gchar *store_account_name;
+ const gchar *transport_account_name;
+
+
+ store_settings = modest_account_settings_get_store_settings (self->settings);
+ transport_settings = modest_account_settings_get_transport_settings (self->settings);
+ store_account_name = modest_server_account_settings_get_account_name (store_settings);
+ transport_account_name = modest_server_account_settings_get_account_name (transport_settings);
+
+ if (store_account_name) {
+ modest_account_mgr_notify_account_update (self->account_manager,
+ store_account_name);
+ }
+ if (transport_account_name) {
+ modest_account_mgr_notify_account_update (self->account_manager,
+ transport_account_name);
+ }
+ g_object_unref (store_settings);
+ g_object_unref (transport_settings);
+
+ if (!self->save_password)
+ hildon_banner_show_information(NULL, NULL, _("mcen_ib_advsetup_settings_saved"));
+ }
+ } else {
+ hildon_banner_show_information (NULL, NULL, _("mail_ib_setting_failed"));
}
- else
- show_error (NULL, _("mail_ib_setting_failed"));
}
}
}
/* Create the notebook to be used by the GtkDialog base class:
* Each page of the notebook will be a page of the wizard: */
self->notebook = GTK_NOTEBOOK (gtk_notebook_new());
+ self->settings = modest_account_settings_new ();
/* Get the account manager object,
* so we can check for existing accounts,
gtk_widget_show (GTK_WIDGET (self->notebook));
/* Add the buttons: */
- gtk_dialog_add_button (GTK_DIALOG(self), GTK_STOCK_OK, GTK_RESPONSE_OK);
- gtk_dialog_add_button (GTK_DIALOG(self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG(self), _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK);
+ gtk_dialog_add_button (GTK_DIALOG(self), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL);
/* Connect to the dialog's response signal: */
/* We use connect-before
G_CALLBACK (on_response), self);
self->modified = FALSE;
-
+ self->save_password = FALSE;
+
/* When this window is shown, hibernation should not be possible,
* because there is no sensible way to save the state: */
modest_window_mgr_prevent_hibernation_while_window_is_shown (
modest_runtime_get_window_mgr (), GTK_WINDOW (self));
+
+ hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_accountsettings",
+ modest_maemo_utils_get_osso_context());
}
ModestAccountSettingsDialog*
/** Update the UI with the stored account details, so they can be edited.
* @account_name: Name of the account, which should contain incoming and outgoing server accounts.
*/
-void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialog *dialog, const gchar* account_name)
+void modest_account_settings_dialog_set_account (ModestAccountSettingsDialog *dialog, ModestAccountSettings *settings)
{
- if (!account_name)
- return;
+ ModestServerAccountSettings *incoming_account;
+ ModestServerAccountSettings *outgoing_account;
+ const gchar *account_name;
+
+ g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS (settings));
+
+ incoming_account = modest_account_settings_get_store_settings (settings);
+ outgoing_account = modest_account_settings_get_transport_settings (settings);
+
+ account_name = modest_account_settings_get_account_name (settings);
/* Save the account name so we can refer to it later: */
if (dialog->account_name)
g_free (dialog->account_name);
dialog->account_name = g_strdup (account_name);
-
-
- /* Get the account data for this account name: */
- ModestAccountData *account_data = modest_account_mgr_get_account_data (dialog->account_manager,
- account_name);
- if (!account_data) {
- g_printerr ("modest: failed to get account data for %s\n", account_name);
- return;
- }
+
+ if (dialog->settings)
+ g_object_unref (dialog->settings);
+ dialog->settings = g_object_ref (settings);
/* Save the account title so we can refer to it if the user changes it: */
if (dialog->original_account_title)
g_free (dialog->original_account_title);
- dialog->original_account_title = g_strdup (account_data->display_name);
+ dialog->original_account_title = g_strdup (modest_account_settings_get_display_name (settings));
-
- if (!(account_data->store_account)) {
- g_printerr ("modest: account has no stores: %s\n", account_name);
- return;
- }
-
/* Show the account data in the widgets: */
/* Note that we never show the non-display name in the UI.
* (Though the display name defaults to the non-display name at the start.) */
gtk_entry_set_text( GTK_ENTRY (dialog->entry_account_title),
- account_data->display_name ? account_data->display_name : "");
-
+ null_means_empty (modest_account_settings_get_display_name (settings)));
gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_name),
- account_data->fullname ? account_data->fullname : "");
+ null_means_empty (modest_account_settings_get_fullname (settings)));
gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_email),
- account_data->email ? account_data->email : "");
-
- ModestServerAccountData *incoming_account = account_data->store_account;
-
- if (incoming_account)
- modest_retrieve_combo_box_fill (MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve), incoming_account->proto);
- gchar *retrieve = modest_account_mgr_get_string (dialog->account_manager, account_name,
- MODEST_ACCOUNT_RETRIEVE, FALSE /* not server account */);
- if (!retrieve) {
- /* Default to something, though no default is specified in the UI spec: */
- retrieve = g_strdup (MODEST_ACCOUNT_RETRIEVE_VALUE_HEADERS_ONLY);
- }
- modest_retrieve_combo_box_set_active_retrieve_conf (MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve), retrieve);
- g_free (retrieve);
-
- const gint limit_retrieve = modest_account_mgr_get_int (dialog->account_manager, account_name,
- MODEST_ACCOUNT_LIMIT_RETRIEVE, FALSE /* not server account */);
- modest_limit_retrieve_combo_box_set_active_limit_retrieve (MODEST_LIMIT_RETRIEVE_COMBO_BOX (dialog->combo_limit_retrieve), limit_retrieve);
+ null_means_empty (modest_account_settings_get_email_address (settings)));
+ modest_retrieve_combo_box_fill (MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve), modest_server_account_settings_get_protocol (incoming_account));
+ modest_retrieve_combo_box_set_active_retrieve_conf (MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve),
+ modest_account_settings_get_retrieve_type (settings));
+ modest_limit_retrieve_combo_box_set_active_limit_retrieve (
+ MODEST_LIMIT_RETRIEVE_COMBO_BOX (dialog->combo_limit_retrieve),
+ modest_account_settings_get_retrieve_limit (settings));
- const gboolean leave_on_server = modest_account_mgr_get_bool (dialog->account_manager, account_name,
- MODEST_ACCOUNT_LEAVE_ON_SERVER, FALSE /* not server account */);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->checkbox_leave_messages), leave_on_server);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->checkbox_leave_messages),
+ modest_account_settings_get_leave_messages_on_server (settings));
/* Only show the leave-on-server checkbox for POP,
* as per the UI spec: */
- if (incoming_account->proto != MODEST_PROTOCOL_STORE_POP) {
+ if (modest_server_account_settings_get_protocol (incoming_account) != MODEST_PROTOCOL_STORE_POP) {
gtk_widget_hide (dialog->caption_leave_messages);
} else {
gtk_widget_show (dialog->caption_leave_messages);
}
- update_incoming_server_security_choices (dialog, incoming_account->proto);
+ update_incoming_server_security_choices (dialog, modest_server_account_settings_get_protocol (incoming_account));
if (incoming_account) {
+ const gchar *username;
+ const gchar *password;
+ const gchar *hostname;
/* Remember this for later: */
- dialog->incoming_protocol = incoming_account->proto;
+ dialog->incoming_protocol = modest_server_account_settings_get_protocol (incoming_account);;
+ hostname = modest_server_account_settings_get_hostname (incoming_account);
+ username = modest_server_account_settings_get_username (incoming_account);
+ password = modest_server_account_settings_get_password (incoming_account);
gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_username),
- incoming_account->username ? incoming_account->username : "");
+ null_means_empty (username));
gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_password),
- incoming_account->password ? incoming_account->password : "");
+ null_means_empty (password));
gtk_entry_set_text( GTK_ENTRY (dialog->entry_incomingserver),
- incoming_account->hostname ? incoming_account->hostname : "");
+ null_means_empty (hostname));
/* The UI spec says:
* 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 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);
+ MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security),
+ modest_server_account_settings_get_security (incoming_account));
/* 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);
- dialog->protocol_authentication_incoming = secure_auth;
- if (modest_protocol_info_is_secure(security) ||
- modest_protocol_info_auth_is_secure(secure_auth))
+ const ModestAuthProtocol secure_auth = modest_server_account_settings_get_auth_protocol (incoming_account);
+ dialog->protocol_authentication_incoming = (secure_auth != MODEST_PROTOCOL_AUTH_NONE)?
+ secure_auth:MODEST_PROTOCOL_AUTH_PASSWORD;
+ ModestConnectionProtocol secure_protocol = modest_server_account_settings_get_security (incoming_account);
+ if (modest_protocol_info_is_secure (secure_protocol) || modest_protocol_info_auth_is_secure(secure_auth))
{
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth),
- TRUE);
+ TRUE);
}
else
{
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth),
- FALSE);
+ FALSE);
};
+
+ gtk_widget_set_sensitive (dialog->checkbox_incoming_auth, !modest_protocol_info_is_secure (secure_protocol));
- update_incoming_server_title (dialog, incoming_account->proto);
+ update_incoming_server_title (dialog, dialog->incoming_protocol);
- const gint port_num = modest_account_mgr_get_int (dialog->account_manager, incoming_account->account_name,
- MODEST_ACCOUNT_PORT, TRUE /* server account */);
-
+ const gint port_num = modest_server_account_settings_get_port (incoming_account);
if (port_num == 0) {
/* Show the appropriate port number: */
on_combo_incoming_security_changed (
hildon_number_editor_set_value (
HILDON_NUMBER_EDITOR (dialog->entry_incoming_port), port_num);
}
+ g_object_unref (incoming_account);
}
- ModestServerAccountData *outgoing_account = account_data->transport_account;
+ outgoing_account = modest_account_settings_get_transport_settings (settings);
if (outgoing_account) {
+ const gchar *hostname;
+ const gchar *username;
+ const gchar *password;
+
/* Remember this for later: */
- dialog->outgoing_protocol = outgoing_account->proto;
-
+ dialog->outgoing_protocol =
+ modest_server_account_settings_get_protocol (outgoing_account);
+
+ hostname = modest_server_account_settings_get_hostname (outgoing_account);
+ username = modest_server_account_settings_get_username (outgoing_account);
+ password = modest_server_account_settings_get_password (outgoing_account);
gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoingserver),
- outgoing_account->hostname ? outgoing_account->hostname : "");
+ null_means_empty (hostname));
gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoing_username),
- outgoing_account->username ? outgoing_account->username : "");
+ null_means_empty (username));
gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoing_password),
- outgoing_account->password ? outgoing_account->password : "");
+ null_means_empty (password));
/* Get the secure-auth setting: */
- const ModestAuthProtocol secure_auth = modest_server_account_get_secure_auth(
- dialog->account_manager, outgoing_account->account_name);
+ const ModestAuthProtocol secure_auth = modest_server_account_settings_get_auth_protocol (outgoing_account);
modest_secureauth_combo_box_set_active_secureauth (
MODEST_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth), secure_auth);
on_combo_outgoing_auth_changed (GTK_COMBO_BOX (dialog->combo_outgoing_auth), dialog);
modest_serversecurity_combo_box_fill (
- MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), outgoing_account->proto);
+ MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security),
+ dialog->outgoing_protocol);
/* Get the security setting: */
- const ModestConnectionProtocol security = modest_server_account_get_security (
- dialog->account_manager, outgoing_account->account_name);
+ const ModestConnectionProtocol security = modest_server_account_settings_get_security (outgoing_account);
modest_serversecurity_combo_box_set_active_serversecurity (
MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), security);
- const gint port_num = modest_account_mgr_get_int (dialog->account_manager, outgoing_account->account_name,
- MODEST_ACCOUNT_PORT, TRUE /* server account */);
+ const gint port_num = modest_server_account_settings_get_port (outgoing_account);
if (port_num == 0) {
/* Show the appropriate port number: */
on_combo_outgoing_security_changed (
}
const gboolean has_specific =
- modest_account_mgr_get_use_connection_specific_smtp (
- dialog->account_manager,
- account_name);
+ modest_account_settings_get_use_connection_specific_smtp (settings);
gtk_toggle_button_set_active (
GTK_TOGGLE_BUTTON (dialog->checkbox_outgoing_smtp_specific),
has_specific);
+ g_object_unref (outgoing_account);
}
/* Set window title according to account: */
* 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);
+ const gchar *account_title = modest_account_settings_get_display_name(settings);
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, */
- /* account_data->store_account->proto */
-
- modest_account_mgr_free_account_data (dialog->account_manager, account_data);
-
/* Unset the modified flag so we can detect changes later: */
dialog->modified = FALSE;
}
static gboolean
save_configuration (ModestAccountSettingsDialog *dialog)
{
- g_assert (dialog->account_name);
-
const gchar* account_name = dialog->account_name;
+ ModestServerAccountSettings *store_settings;
+ ModestServerAccountSettings *transport_settings;
/* Set the account data from the widgets: */
- const gchar* user_name = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_name));
- gboolean test = modest_account_mgr_set_string (dialog->account_manager, account_name,
- MODEST_ACCOUNT_FULLNAME, user_name, FALSE /* not server account */);
- if (!test)
- return FALSE;
-
+ const gchar* user_fullname = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_name));
+ modest_account_settings_set_fullname (dialog->settings, user_fullname);
+
const gchar* emailaddress = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_email));
- test = modest_account_mgr_set_string (dialog->account_manager, account_name,
- MODEST_ACCOUNT_EMAIL, emailaddress, FALSE /* not server account */);
- if (!test)
- return FALSE;
+ modest_account_settings_set_email_address (dialog->settings, emailaddress);
/* Signature: */
if (dialog->signature_dialog) {
gboolean use_signature = FALSE;
- gchar *signature = modest_signature_editor_dialog_get_settings (
- MODEST_SIGNATURE_EDITOR_DIALOG (dialog->signature_dialog),
- &use_signature);
+ gchar *signature =
+ modest_signature_editor_dialog_get_settings (MODEST_SIGNATURE_EDITOR_DIALOG (dialog->signature_dialog),
+ &use_signature);
- modest_account_mgr_set_signature(dialog->account_manager, account_name,
- signature, use_signature);
- g_free (signature);
- }
+ modest_account_settings_set_use_signature (dialog->settings, use_signature);
+ modest_account_settings_set_signature (dialog->settings, signature);
+ }
- gchar *retrieve = modest_retrieve_combo_box_get_active_retrieve_conf (
+ ModestAccountRetrieveType retrieve_type = modest_retrieve_combo_box_get_active_retrieve_conf (
MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve));
- modest_account_mgr_set_string (dialog->account_manager, account_name,
- MODEST_ACCOUNT_RETRIEVE, retrieve, FALSE /* not server account */);
- g_free (retrieve);
+ modest_account_settings_set_retrieve_type (dialog->settings, retrieve_type);
- const gint limit_retrieve = modest_limit_retrieve_combo_box_get_active_limit_retrieve (
+ gint retrieve_limit = modest_limit_retrieve_combo_box_get_active_limit_retrieve (
MODEST_LIMIT_RETRIEVE_COMBO_BOX (dialog->combo_limit_retrieve));
- modest_account_mgr_set_int (dialog->account_manager, account_name,
- MODEST_ACCOUNT_LIMIT_RETRIEVE, limit_retrieve, FALSE /* not server account */);
+ modest_account_settings_set_retrieve_limit (dialog->settings, retrieve_limit);
const gboolean leave_on_server = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->checkbox_leave_messages));
- test = modest_account_mgr_set_bool (dialog->account_manager, account_name,
- MODEST_ACCOUNT_LEAVE_ON_SERVER, leave_on_server, FALSE /* not server account */);
- if (!test)
- return FALSE;
+ modest_account_settings_set_leave_messages_on_server (dialog->settings, leave_on_server);
+
+ store_settings = modest_account_settings_get_store_settings (dialog->settings);
- /* Incoming: */
- gchar* incoming_account_name = modest_account_mgr_get_string (dialog->account_manager, account_name,
- MODEST_ACCOUNT_STORE_ACCOUNT, FALSE /* not server account */);
- g_assert (incoming_account_name);
-
const gchar* hostname = gtk_entry_get_text (GTK_ENTRY (dialog->entry_incomingserver));
- test = modest_account_mgr_set_string (dialog->account_manager, incoming_account_name,
- MODEST_ACCOUNT_HOSTNAME, hostname, TRUE /* server account */);
- if (!test)
- return FALSE;
+ modest_server_account_settings_set_hostname (store_settings, hostname);
const gchar* username = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_username));
- modest_server_account_set_username (dialog->account_manager, incoming_account_name, username);
+ modest_server_account_settings_set_username (store_settings, username);
const gchar* password = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_password));
- modest_server_account_set_password (dialog->account_manager, incoming_account_name, password);
+ modest_server_account_settings_set_password (store_settings, password);
/* port: */
gint port_num = hildon_number_editor_get_value (
HILDON_NUMBER_EDITOR (dialog->entry_incoming_port));
- modest_account_mgr_set_int (dialog->account_manager, incoming_account_name,
- MODEST_ACCOUNT_PORT, port_num, TRUE /* server account */);
+ modest_server_account_settings_set_port (store_settings, port_num);
/* The UI spec says:
* 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.
+ * If secure authentication is checked, require one of the secure
+ * methods during connection: SSL, TLS, CRAM-MD5 etc.
*/
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);
-
- modest_server_account_set_secure_auth (dialog->account_manager, incoming_account_name, dialog->protocol_authentication_incoming);
-
-
- g_free (incoming_account_name);
+ modest_server_account_settings_set_security (store_settings, protocol_security_incoming);
+ if (modest_protocol_info_is_secure (protocol_security_incoming)) {
+ modest_server_account_settings_set_auth_protocol (store_settings, FALSE);
+ } else {
+ modest_server_account_settings_set_auth_protocol (store_settings,
+ dialog->protocol_authentication_incoming);
+ }
+
+ g_object_unref (store_settings);
/* Outgoing: */
- gchar* outgoing_account_name = modest_account_mgr_get_string (dialog->account_manager, account_name,
- MODEST_ACCOUNT_TRANSPORT_ACCOUNT, FALSE /* not server account */);
- g_assert (outgoing_account_name);
+ transport_settings = modest_account_settings_get_transport_settings (dialog->settings);
hostname = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoingserver));
- test = modest_account_mgr_set_string (dialog->account_manager, outgoing_account_name,
- MODEST_ACCOUNT_HOSTNAME, hostname, TRUE /* server account */);
- if (!test)
- return FALSE;
+ modest_server_account_settings_set_hostname (transport_settings, hostname);
username = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoing_username));
- modest_server_account_set_username (dialog->account_manager, outgoing_account_name,
- username);
+ modest_server_account_settings_set_username (transport_settings, username);
password = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoing_password));
- modest_server_account_set_password (dialog->account_manager, outgoing_account_name,
- password);
+ modest_server_account_settings_set_password (transport_settings, password);
const ModestConnectionProtocol protocol_security_outgoing = modest_serversecurity_combo_box_get_active_serversecurity (
MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security));
- modest_server_account_set_security (dialog->account_manager, outgoing_account_name, protocol_security_outgoing);
+ modest_server_account_settings_set_security (transport_settings, protocol_security_outgoing);
const ModestAuthProtocol protocol_authentication_outgoing = modest_secureauth_combo_box_get_active_secureauth (
MODEST_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth));
- modest_server_account_set_secure_auth (dialog->account_manager, outgoing_account_name, protocol_authentication_outgoing);
+ modest_server_account_settings_set_auth_protocol (transport_settings, protocol_authentication_outgoing);
/* port: */
port_num = hildon_number_editor_get_value (
HILDON_NUMBER_EDITOR (dialog->entry_outgoing_port));
- modest_account_mgr_set_int (dialog->account_manager, outgoing_account_name,
- MODEST_ACCOUNT_PORT, port_num, TRUE /* server account */);
-
- g_free (outgoing_account_name);
+ modest_server_account_settings_set_port (transport_settings, port_num);
+ g_object_unref (transport_settings);
/* Set the changed account title last, to simplify the previous code: */
if (!account_title)
return FALSE; /* Should be prevented already anyway. */
- if (strcmp(account_title, account_name) != 0) {
- /* Change the title: */
- const gboolean test = modest_account_mgr_set_string (dialog->account_manager, account_name,
- MODEST_ACCOUNT_DISPLAY_NAME, account_title, FALSE /* not server account */);
- if (!test) {
- g_free (account_title);
- return FALSE;
- }
- }
-
+/* if (strcmp (account_title, account_name) != 0) { */
+ modest_account_settings_set_display_name (dialog->settings, account_title);
+/* } */
g_free (account_title);
account_title = NULL;
/* Save connection-specific SMTP server accounts: */
- modest_account_mgr_set_use_connection_specific_smtp(dialog->account_manager, account_name,
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbox_outgoing_smtp_specific)));
- if (dialog->specific_window) {
- return modest_connection_specific_smtp_window_save_server_accounts (
- MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (dialog->specific_window), account_name);
- }
- else
- return TRUE;
+ modest_account_settings_set_use_connection_specific_smtp
+ (dialog->settings,
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbox_outgoing_smtp_specific)));
+
+ /* this configuration is not persistent, we should not save */
+ if (account_name != NULL)
+ modest_account_mgr_save_account_settings (dialog->account_manager, dialog->settings);
+
+ return TRUE;
}
static gboolean entry_is_empty (GtkWidget *entry)
enable_buttons (ModestAccountSettingsDialog *self)
{
gboolean enable_ok = TRUE;
+ ModestAuthProtocol outgoing_auth_protocol;
/* The account details title is mandatory: */
if (entry_is_empty(self->entry_account_title))
- enable_ok = FALSE;
+ enable_ok = FALSE;
/* The user details username is mandatory: */
- if (entry_is_empty(self->entry_user_username))
+ if (enable_ok && entry_is_empty(self->entry_user_username))
enable_ok = FALSE;
/* The user details email address is mandatory: */
enable_ok = FALSE;
/* The custom incoming server is mandatory: */
- if (entry_is_empty(self->entry_incomingserver))
+ if (enable_ok && entry_is_empty(self->entry_incomingserver))
enable_ok = FALSE;
+
+ /* The custom incoming server is mandatory: */
+ if (enable_ok && entry_is_empty(self->entry_outgoingserver))
+ enable_ok = FALSE;
+
+ /* Outgoing username is mandatory if outgoing auth is secure */
+ if (self->combo_outgoing_auth) {
+ outgoing_auth_protocol = modest_secureauth_combo_box_get_active_secureauth (
+ MODEST_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth));
+ if (enable_ok &&
+ outgoing_auth_protocol != MODEST_PROTOCOL_AUTH_NONE &&
+ entry_is_empty (self->entry_outgoing_username))
+ enable_ok = FALSE;
+ }
/* Enable the buttons,
* identifying them via their associated response codes:
*/
GtkDialog *dialog_base = GTK_DIALOG (self);
- gtk_dialog_set_response_sensitive (dialog_base,
- GTK_RESPONSE_OK,
- enable_ok);
+ gtk_dialog_set_response_sensitive (dialog_base,
+ GTK_RESPONSE_OK,
+ enable_ok);
}
+void
+modest_account_settings_dialog_check_allow_changes (ModestAccountSettingsDialog *self)
+{
+ ModestServerAccountSettings *incoming_settings;
+ const gchar *server_account_name;
+ gboolean username_known;
+
+ if (!G_IS_OBJECT (self->settings))
+ return;
+
+ incoming_settings = modest_account_settings_get_store_settings (self->settings);
+ server_account_name = modest_server_account_settings_get_account_name (incoming_settings);
+
+ username_known = modest_account_mgr_get_server_account_username_has_succeeded (self->account_manager,
+ server_account_name);
+
+ /* Enable or disable widgets */
+ gtk_widget_set_sensitive (self->entry_user_username, !username_known);
+ gtk_widget_set_sensitive (self->entry_incomingserver, !username_known);
+ /* gtk_widget_set_sensitive (self->entry_outgoingserver, !username_known); */
+ /* gtk_widget_set_sensitive (self->entry_outgoing_username, !username_known); */
+ gtk_widget_set_sensitive (self->entry_incoming_port, !username_known);
+/* gtk_widget_set_sensitive (self->entry_outgoing_port, !username_known); */
+ gtk_widget_set_sensitive (self->combo_incoming_security, !username_known);
+/* gtk_widget_set_sensitive (self->combo_outgoing_security, !username_known); */
+}
+
+void
+modest_account_settings_dialog_set_modified (ModestAccountSettingsDialog *dialog, gboolean modified)
+{
+ g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS_DIALOG (dialog));
+
+ dialog->modified = modified;
+
+}
+
+void
+modest_account_settings_dialog_save_password (ModestAccountSettingsDialog *dialog)
+{
+ g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS_DIALOG (dialog));
+
+ dialog->save_password = TRUE;
+ dialog->modified = TRUE;
+}
+
+
static void
modest_account_settings_dialog_class_init (ModestAccountSettingsDialogClass *klass)
{
object_class->dispose = modest_account_settings_dialog_dispose;
object_class->finalize = modest_account_settings_dialog_finalize;
}
-
-static void
-show_error (GtkWidget *parent_widget, const gchar* text)
-{
- hildon_banner_show_information(parent_widget, NULL, text);
-
-#if 0
- GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_widget, text);
- /*
- GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window,
- (GtkDialogFlags)0,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- text ));
- */
-
- gtk_dialog_run (dialog);
- gtk_widget_destroy (GTK_WIDGET (dialog));
-#endif
-}
projects / modest / blobdiff