#include "maemo/easysetup/modest-easysetup-country-combo-box.h"
#include "maemo/easysetup/modest-easysetup-provider-combo-box.h"
#include "maemo/easysetup/modest-easysetup-servertype-combo-box.h"
-#include "maemo/easysetup/modest-easysetup-serversecurity-combo-box.h"
-#include "maemo/easysetup/modest-easysetup-secureauth-combo-box.h"
-#include "maemo/easysetup/modest-validating-entry.h"
+#include "widgets/modest-easysetup-serversecurity-combo-box.h"
+#include "widgets/modest-easysetup-secureauth-combo-box.h"
+#include "widgets/modest-validating-entry.h"
+#include "widgets/modest-retrieve-combo-box.h"
+#include "widgets/modest-limit-retrieve-combo-box.h"
#include "modest-text-utils.h"
#include "modest-account-mgr.h"
#include "modest-account-mgr-helpers.h" /* For modest_account_mgr_get_account_data(). */
{
ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (object);
- if (self->original_account_name)
- g_free (self->original_account_name);
+ if (self->account_name)
+ g_free (self->account_name);
+
+ if (self->original_account_title)
+ g_free (self->original_account_title);
if (self->account_manager)
g_object_unref (G_OBJECT (self->account_manager));
+
+ if (self->specific_window)
+ gtk_widget_destroy (self->specific_window);
G_OBJECT_CLASS (modest_account_settings_dialog_parent_class)->finalize (object);
}
static void
show_ok (GtkWindow *parent_window, const gchar* text);
+static void
+on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data);
+
+static void
+on_combo_outgoing_security_changed (GtkComboBox *widget, gpointer user_data);
+
+static void
+on_modified_combobox_changed (GtkComboBox *widget, gpointer user_data)
+{
+ ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ self->modified = TRUE;
+}
+
+static void
+on_modified_entry_changed (GtkEditable *editable, gpointer user_data)
+{
+ ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ self->modified = TRUE;
+}
+
+static void
+on_modified_checkbox_toggled (GtkToggleButton *togglebutton, gpointer user_data)
+{
+ ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ self->modified = TRUE;
+}
+
+/* Set a modified boolean whenever the widget is changed,
+ * so we can check for it later.
+ */
+static void
+connect_for_modified (ModestAccountSettingsDialog *self, GtkWidget *widget)
+{
+ if (GTK_IS_ENTRY (widget)) {
+ g_signal_connect (G_OBJECT (widget), "changed",
+ G_CALLBACK (on_modified_entry_changed), self);
+ } else if (GTK_IS_COMBO_BOX (widget)) {
+ g_signal_connect (G_OBJECT (widget), "changed",
+ G_CALLBACK (on_modified_combobox_changed), self);
+ } else if (GTK_IS_TOGGLE_BUTTON (widget)) {
+ g_signal_connect (G_OBJECT (widget), "toggled",
+ G_CALLBACK (on_modified_checkbox_toggled), self);
+ }
+}
static void
on_caption_entry_changed (GtkEditable *editable, gpointer user_data)
GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_account_title"),
self->entry_account_title, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->entry_account_title);
+ connect_for_modified (self, self->entry_account_title);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
gtk_widget_show (caption);
* TODO: The UI spec seems to want us to show a dialog if we hit the maximum. */
gtk_entry_set_max_length (GTK_ENTRY (self->entry_account_title), 64);
- /* TODO: The Retrieve and Limit Retrieve combo boxes. */
+ /* The retrieve combobox: */
+ self->combo_retrieve = GTK_WIDGET (modest_retrieve_combo_box_new ());
+ caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_retrievetype"),
+ self->combo_retrieve, NULL, HILDON_CAPTION_MANDATORY);
+ gtk_widget_show (self->combo_retrieve);
+ connect_for_modified (self, self->combo_retrieve);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_widget_show (caption);
+ /* The limit-retrieve combobox: */
+ self->combo_limit_retrieve = GTK_WIDGET (modest_limit_retrieve_combo_box_new ());
+ caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_limit_retrieve"),
+ self->combo_limit_retrieve, NULL, HILDON_CAPTION_MANDATORY);
+ gtk_widget_show (self->combo_limit_retrieve);
+ connect_for_modified (self, self->combo_limit_retrieve);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_widget_show (caption);
+
/* The leave-messages widgets: */
if(!self->checkbox_leave_messages)
self->checkbox_leave_messages =
gtk_check_button_new_with_label (_("mcen_fi_advsetup_leave_on_server"));
gtk_box_pack_start (GTK_BOX (box), self->checkbox_leave_messages, FALSE, FALSE, 2);
gtk_widget_show (self->checkbox_leave_messages);
-
+ connect_for_modified (self, self->checkbox_leave_messages);
gtk_widget_show (GTK_WIDGET (box));
GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup,
_("mcen_li_emailsetup_name"), self->entry_user_name, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_user_name);
+ connect_for_modified (self, self->entry_user_name);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
gtk_widget_show (caption);
caption = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_username"),
self->entry_user_username, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->entry_user_username);
+ connect_for_modified (self, self->entry_user_username);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
gtk_widget_show (caption);
caption = create_caption_new_with_asterix (self, sizegroup,
_("mail_fi_password"), self->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_user_password);
+ connect_for_modified (self, self->entry_user_password);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
gtk_widget_show (caption);
_("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_widget_show (self->entry_user_email);
+ connect_for_modified (self, self->entry_user_email);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
gtk_widget_show (caption);
self->caption_incoming = create_caption_new_with_asterix (self, sizegroup,
"Incoming Server", self->entry_incomingserver, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->entry_incomingserver);
+ connect_for_modified (self, self->entry_incomingserver);
gtk_box_pack_start (GTK_BOX (box), self->caption_incoming, FALSE, FALSE, 2);
gtk_widget_show (self->caption_incoming);
GtkWidget *caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"),
self->combo_incoming_security, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->combo_incoming_security);
+ connect_for_modified (self, self->combo_incoming_security);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
gtk_widget_show (caption);
+ /* Show a default port number when the security method changes, as per the UI spec: */
+ g_signal_connect (G_OBJECT (self->combo_incoming_security), "changed", (GCallback)on_combo_incoming_security_changed, self);
+
+
/* The port widgets: */
/* TODO: There are various rules about this in the UI spec. */
if (!self->entry_incoming_port)
caption = hildon_caption_new (sizegroup, _("mcen_fi_emailsetup_port"),
self->entry_incoming_port, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_incoming_port);
+ connect_for_modified (self, self->entry_incoming_port);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
gtk_widget_show (caption);
gtk_check_button_new_with_label (_("mcen_li_emailsetup_secure_authentication"));
gtk_box_pack_start (GTK_BOX (box), self->checkbox_incoming_auth, FALSE, FALSE, 2);
gtk_widget_show (self->checkbox_incoming_auth);
+ connect_for_modified (self, self->checkbox_incoming_auth);
gtk_widget_show (GTK_WIDGET (box));
/* Set the starting sensitivity: */
on_toggle_button_changed (button, widget);
}
-
-static void
-on_smtp_servers_window_hide (GtkWindow *window, gpointer user_data)
-{
- /* Destroy the window when it is closed: */
- gtk_widget_destroy (GTK_WIDGET (window));
-}
static void
on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data)
{
-
ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
- /* Show the window: */
- /* TODO: Retrieve the chosen settings,
- * so we can supply them when creating the connection somehow.
- */
- GtkWidget *window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
- gtk_window_set_transient_for (GTK_WINDOW (self), GTK_WINDOW (window));
- g_signal_connect (G_OBJECT (window), "hide",
- G_CALLBACK (on_smtp_servers_window_hide), self);
- gtk_widget_show (window);
+ /* 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);
+ }
+
+ /* 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);
}
static void
gtk_widget_set_sensitive (self->caption_outgoing_password, secureauth_used);
}
+static void
+on_combo_outgoing_security_changed (GtkComboBox *widget, gpointer user_data)
+{
+ ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+
+ const gint port_number =
+ easysetup_serversecurity_combo_box_get_active_serversecurity_port (
+ EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security));
+
+ if(port_number != 0) {
+ gchar* str = g_strdup_printf ("%d", port_number);
+ gtk_entry_set_text (GTK_ENTRY (self->entry_outgoing_port), str);
+ g_free (str);
+ }
+}
+
+static void
+on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data)
+{
+ ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+
+ const gint port_number =
+ easysetup_serversecurity_combo_box_get_active_serversecurity_port (
+ EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security));
+
+ if(port_number != 0) {
+ gchar* str = g_strdup_printf ("%d", port_number);
+ gtk_entry_set_text (GTK_ENTRY (self->entry_incoming_port), str);
+ g_free (str);
+ }
+}
+
+
static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
{
GtkWidget *box = gtk_vbox_new (FALSE, 2);
GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup,
_("mcen_li_emailsetup_smtp"), self->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_outgoingserver);
+ connect_for_modified (self, self->entry_outgoingserver);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
gtk_widget_show (caption);
caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"),
self->combo_outgoing_auth, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->combo_outgoing_auth);
+ connect_for_modified (self, self->combo_outgoing_auth);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
gtk_widget_show (caption);
self->caption_outgoing_username = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_username"),
self->entry_outgoing_username, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->entry_outgoing_username);
+ connect_for_modified (self, self->entry_outgoing_username);
gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_username, FALSE, FALSE, 2);
gtk_widget_show (self->caption_outgoing_username);
self->caption_outgoing_password = create_caption_new_with_asterix (self, sizegroup,
_("mail_fi_password"), self->entry_outgoing_password, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_outgoing_password);
+ connect_for_modified (self, self->entry_outgoing_password);
gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_password, FALSE, FALSE, 2);
gtk_widget_show (self->caption_outgoing_password);
caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"),
self->combo_outgoing_security, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->combo_outgoing_security);
+ connect_for_modified (self, self->combo_outgoing_security);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
- gtk_widget_show (caption);
+ gtk_widget_show (caption);
+
+ /* Show a default port number when the security method changes, as per the UI spec: */
+ g_signal_connect (G_OBJECT (self->combo_outgoing_security), "changed", (GCallback)on_combo_outgoing_security_changed, self);
/* The port widgets: */
if (!self->entry_outgoing_port)
caption = hildon_caption_new (sizegroup, _("mcen_fi_emailsetup_port"),
self->entry_outgoing_port, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_outgoing_port);
+ connect_for_modified (self, self->entry_outgoing_port);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
gtk_widget_show (caption);
}
gtk_box_pack_start (GTK_BOX (box), self->checkbox_outgoing_smtp_specific, FALSE, FALSE, 2);
gtk_widget_show (self->checkbox_outgoing_smtp_specific);
+ connect_for_modified (self, self->checkbox_outgoing_smtp_specific);
/* Connection-specific SMTP-Severs Edit button: */
if (!self->button_outgoing_smtp_servers)
check_data (ModestAccountSettingsDialog *self)
{
/* Check that the title is not already in use: */
- const gchar* account_name = gtk_entry_get_text (GTK_ENTRY (self->entry_account_title));
- if ((!account_name) || (strlen(account_name) == 0))
+ const gchar* account_title = gtk_entry_get_text (GTK_ENTRY (self->entry_account_title));
+ if ((!account_title) || (strlen(account_title) == 0))
return FALSE; /* Should be prevented already anyway. */
- if (strcmp(account_name, self->original_account_name) != 0) {
+ if (strcmp(account_title, self->original_account_title) != 0) {
/* Check the changed title: */
const gboolean name_in_use = modest_account_mgr_account_with_display_name_exists (self->account_manager,
- account_name);
+ account_title);
if (name_in_use) {
/* Warn the user via a dialog: */
/* TODO: The UI Spec wants us to check that the servernames are valid,
* but does not specify how.
*/
+
+ return TRUE;
}
/*
*/
ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (wizard_dialog);
enable_buttons (self);
- /* TODO: Prevent the OK response if the data is invalid. */
-
gboolean prevent_response = FALSE;
/* Warn about unsaved changes: */
- /* TODO: Actually detect whether changes were made. */
- if (response_id == GTK_RESPONSE_CANCEL) {
+ if (response_id == GTK_RESPONSE_CANCEL && self->modified) {
GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (GTK_WINDOW (self),
(GtkDialogFlags)0,
GTK_MESSAGE_INFO,
* to stop the default signal handler from closing the dialog.
*/
g_signal_connect (G_OBJECT (self), "response",
- G_CALLBACK (on_response), self);
+ G_CALLBACK (on_response), self);
+
+ self->modified = FALSE;
}
ModestAccountSettingsDialog*
if (!account_name)
return;
- /* Save the account name so we can refer to it if the user changes it: */
- if (dialog->original_account_name)
- g_free (dialog->original_account_name);
- dialog->original_account_name = g_strdup (account_name);
+ /* 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);
g_printerr ("modest: failed to get account data for %s\n", account_name);
return;
}
+
+ /* 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);
+
if (!(account_data->store_account)) {
g_printerr ("modest: account has no stores: %s\n", account_name);
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);
+
+
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), leave_on_server);
+
+ /* Only show the leave-on-server checkbox for POP,
+ * as per the UI spec: */
+ if (incoming_account->proto != MODEST_PROTOCOL_STORE_POP) {
+ gtk_widget_hide (dialog->checkbox_leave_messages);
+ } else {
+ gtk_widget_show (dialog->checkbox_leave_messages);
+ }
- ModestServerAccountData *incoming_account = account_data->store_account;
if (incoming_account) {
gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_username),
incoming_account->username ? incoming_account->username : "");
gtk_entry_set_text( GTK_ENTRY (dialog->entry_incomingserver),
incoming_account->hostname ? incoming_account->hostname : "");
- easysetup_serversecurity_combo_box_set_active_serversecurity (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security), incoming_account->proto);
+ const ModestProtocol 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);
+
update_incoming_server_title (dialog, incoming_account->proto);
update_incoming_server_security_choices (dialog, incoming_account->proto);
+ const ModestProtocol security = modest_server_account_get_security (
+ dialog->account_manager, incoming_account->account_name);
+ easysetup_serversecurity_combo_box_set_active_serversecurity (
+ EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security), security);
+
+ const gint port_num = modest_account_mgr_get_int (dialog->account_manager, incoming_account->account_name,
+ MODEST_ACCOUNT_PORT, TRUE /* server account */);
+ gchar *port_str = g_strdup_printf ("%d", port_num);
+ gtk_entry_set_text (GTK_ENTRY (dialog->entry_incoming_port), port_str);
+ g_free (port_str);
+
/* TODO:
gchar *uri;
ModestProtocol proto;
gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoingserver),
outgoing_account->hostname ? outgoing_account->hostname : "");
- /* TODO: Dim these if secure authentication is None, as per the UI spec: */
gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoing_username),
outgoing_account->username ? outgoing_account->username : "");
gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoing_password),
outgoing_account->password ? outgoing_account->password : "");
- /* TODO: How do we get the auth setting from the server account struct?: */
- /* This seems to be in ->options, with hard-coded option names.
- * This will need new API in ModestAccountMgr. */
+ /* Get the secure-auth setting: */
+ const ModestProtocol secure_auth = modest_server_account_get_secure_auth(
+ dialog->account_manager, outgoing_account->account_name);
easysetup_secureauth_combo_box_set_active_secureauth (
- EASYSETUP_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth), MODEST_PROTOCOL_AUTH_NONE);
+ EASYSETUP_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth), secure_auth);
on_combo_outgoing_auth_changed (GTK_COMBO_BOX (dialog->combo_outgoing_auth), dialog);
easysetup_serversecurity_combo_box_fill (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), outgoing_account->proto);
-
- printf("debug: incoming options list=%p\n", incoming_account->options);
- printf("debug: outgoing options list=%p\n", outgoing_account->options);
-
- gchar* debug = modest_server_account_data_get_option_value (incoming_account->options, MODEST_ACCOUNT_OPTION_SSL);
- printf("debug: ssl option=X%sX\n", debug);
-
- gboolean bdebug = modest_server_account_data_get_option_bool (incoming_account->options, MODEST_ACCOUNT_OPTION_USE_LSUB);
- printf("debug: ssl option=X%dX\n", bdebug);
+ EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), outgoing_account->proto);
+ /* Get the security setting: */
+ const ModestProtocol security = modest_server_account_get_security (
+ dialog->account_manager, outgoing_account->account_name);
+ easysetup_serversecurity_combo_box_set_active_serversecurity (
+ EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), security);
- /* TODO: set port. */
+ const gint port_num = modest_account_mgr_get_int (dialog->account_manager, outgoing_account->account_name,
+ MODEST_ACCOUNT_PORT, TRUE /* server account */);
+ gchar *port_str = g_strdup_printf ("%d", port_num);
+ gtk_entry_set_text (GTK_ENTRY (dialog->entry_outgoing_port), port_str);
+ g_free (port_str);
}
- /* TODO: account_data->display_name */
/* 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->original_account_name);
+ g_assert (dialog->account_name);
- const gchar* account_name = dialog->original_account_name;
+ const gchar* account_name = dialog->account_name;
/* Set the account data from the widgets: */
const gchar* user_name = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_name));
MODEST_ACCOUNT_EMAIL, emailaddress, FALSE /* not server account */);
if (!test)
return FALSE;
-
- /* TODO: Change name: */
- /* Possibly the account name may never change, but that should be hidden,
- * and the display name may change, defaulting to the account name.
- */
+
+ gchar *retrieve = 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);
+
+ const gint limit_retrieve = 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 */);
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,
if (!test)
return FALSE;
- /* TODO: How can we set these in the server account?:
- ModestProtocol protocol_authentication_incoming = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->checkbox_incoming_auth))
+ const ModestProtocol protocol_authentication_incoming = gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth))
? MODEST_PROTOCOL_AUTH_PASSWORD
: MODEST_PROTOCOL_AUTH_NONE;
+ modest_server_account_set_secure_auth (dialog->account_manager, incoming_account_name, protocol_authentication_incoming);
- ModestProtocol protocol_security_incoming = easysetup_serversecurity_combo_box_get_active_serversecurity (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security));
-
- */
-
+ const ModestProtocol protocol_security_incoming = easysetup_serversecurity_combo_box_get_active_serversecurity (
+ EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security));
+ modest_server_account_set_security (dialog->account_manager, incoming_account_name, protocol_security_incoming);
+
+ /* port: */
+ const gchar* port_str = gtk_entry_get_text (GTK_ENTRY (dialog->entry_incoming_port));
+ gint port_num = 0;
+ if (port_str)
+ port_num = atoi (port_str);
+ modest_account_mgr_set_int (dialog->account_manager, incoming_account_name,
+ MODEST_ACCOUNT_PORT, port_num, TRUE /* server account */);
+
g_free (incoming_account_name);
/* Outgoing: */
if (!test)
return FALSE;
- /* TODO: How do we set these in the account data?:
- ModestProtocol protocol_security_outgoing = easysetup_serversecurity_combo_box_get_active_serversecurity (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security));
+ const ModestProtocol protocol_security_outgoing = easysetup_serversecurity_combo_box_get_active_serversecurity (
+ EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security));
+ modest_server_account_set_security (dialog->account_manager, outgoing_account_name, protocol_security_outgoing);
- ModestProtocol protocol_authentication_outgoing = easysetup_secureauth_combo_box_get_active_secureauth (
- EASYSETUP_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth));
- */
+ const ModestProtocol protocol_authentication_outgoing = easysetup_secureauth_combo_box_get_active_secureauth (
+ EASYSETUP_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth));
+ modest_server_account_set_secure_auth (dialog->account_manager, outgoing_account_name, protocol_authentication_outgoing);
+ /* port: */
+ port_str = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoing_port));
+ port_num = 0;
+ if (port_str)
+ port_num = atoi (port_str);
+ modest_account_mgr_set_int (dialog->account_manager, outgoing_account_name,
+ MODEST_ACCOUNT_PORT, port_num, TRUE /* server account */);
+
g_free (outgoing_account_name);
return FALSE;
}
- return TRUE;
+ /* Save connection-specific SMTP server accounts: */
+ 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;
}
static gboolean entry_is_empty (GtkWidget *entry)
projects / modest / blobdiff