#include <gtk/gtkbutton.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtkstock.h>
#include <hildon-widgets/hildon-caption.h>
#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(). */
#include "modest-runtime.h" /* For modest_runtime_get_account_mgr(). */
#include "maemo/modest-connection-specific-smtp-window.h"
#include <gconf/gconf-client.h>
};
static void
+enable_buttons (ModestAccountSettingsDialog *self);
+
+static gboolean
+save_configuration (ModestAccountSettingsDialog *dialog);
+
+static void
modest_account_settings_dialog_get_property (GObject *object, guint property_id,
GValue *value, GParamSpec *pspec)
{
{
ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (object);
+ 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);
}
-#if 0
static void
show_error (GtkWindow *parent_window, const gchar* text);
-#endif
static void
-set_default_custom_servernames(ModestAccountSettingsDialog *dialog);
+show_ok (GtkWindow *parent_window, const gchar* text);
+
+static void
+on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data);
-static gchar*
-util_increment_name (const gchar* text);
+static void
+on_combo_outgoing_security_changed (GtkComboBox *widget, gpointer user_data);
static void
-enable_buttons (ModestAccountSettingsDialog *self)
+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
* We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
/* The description widgets: */
self->entry_account_title = GTK_WIDGET (easysetup_validating_entry_new ());
-
- /* Set a default account title, choosing one that does not already exist: */
- gchar* default_acount_name = g_strdup (_("mcen_ia_emailsetup_defaultname"));
- while (modest_account_mgr_account_exists (self->account_manager,
- default_acount_name, FALSE /* server_account */)) {
-
- gchar * default_account_name2 = util_increment_name (default_acount_name);
- g_free (default_acount_name);
- default_acount_name = default_account_name2;
- }
-
- gtk_entry_set_text( GTK_ENTRY (self->entry_account_title), default_acount_name);
- g_free (default_acount_name);
- default_acount_name = NULL;
-
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);
+ /* 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));
return GTK_WIDGET (box);
}
+static void
+on_button_signature (GtkButton *button, gpointer user_data)
+{
+
+}
+
static GtkWidget*
create_page_user_details (ModestAccountSettingsDialog *self)
{
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);
gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_email), 64);
+ /* Signature button: */
+ if (!self->button_signature)
+ self->button_signature = gtk_button_new_with_label (_("mcen_bd_emailsetup_edit"));
+ caption = hildon_caption_new (sizegroup, _("mcen_fi_email_signature"),
+ self->button_signature, NULL, HILDON_CAPTION_OPTIONAL);
+ gtk_widget_show (self->button_signature);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_widget_show (caption);
+
+ g_signal_connect (G_OBJECT (self->button_signature), "clicked",
+ G_CALLBACK (on_button_signature), self);
+
gtk_widget_show (GTK_WIDGET (box));
return GTK_WIDGET (box);
/** Change the caption title for the incoming server,
* as specified in the UI spec:
*/
-static void update_incoming_server_title (ModestAccountSettingsDialog *self)
+static void update_incoming_server_title (ModestAccountSettingsDialog *self, ModestProtocol protocol)
{
- ModestProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
- EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype));
const gchar* type =
(protocol == MODEST_PROTOCOL_STORE_POP ?
_("mail_fi_emailtype_pop3") :
/** Change the caption title for the incoming server,
* as specified in the UI spec:
*/
-static void update_incoming_server_security_choices (ModestAccountSettingsDialog *self)
+static void update_incoming_server_security_choices (ModestAccountSettingsDialog *self, ModestProtocol protocol)
{
- ModestProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
- EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype));
-
/* Fill the combo with appropriately titled choices for POP or IMAP. */
/* The choices are the same, but the titles are different, as in the UI spec. */
easysetup_serversecurity_combo_box_fill (
EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), protocol);
}
-
-static void on_combo_servertype_changed(GtkComboBox *combobox, gpointer user_data)
-{
- ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
- update_incoming_server_title (self);
- update_incoming_server_security_choices (self);
-}
static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self)
{
GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* The incoming server widgets: */
- if (!self->combo_incoming_servertype)
- self->combo_incoming_servertype = GTK_WIDGET (easysetup_servertype_combo_box_new ());
- easysetup_servertype_combo_box_set_active_servertype (
- EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype), MODEST_PROTOCOL_STORE_POP);
- GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup,
- _("mcen_li_emailsetup_type"), self->combo_incoming_servertype, NULL, HILDON_CAPTION_MANDATORY);
- gtk_widget_show (self->combo_incoming_servertype);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
- gtk_widget_show (caption);
-
if(!self->entry_incomingserver)
self->entry_incomingserver = gtk_entry_new ();
- set_default_custom_servernames (self);
if (self->caption_incoming)
gtk_widget_destroy (self->caption_incoming);
/* (Note: Changing the title seems pointless. murrayc) */
self->caption_incoming = create_caption_new_with_asterix (self, sizegroup,
"Incoming Server", self->entry_incomingserver, NULL, HILDON_CAPTION_MANDATORY);
- update_incoming_server_title (self);
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);
- /* Change the caption title when the servertype changes,
- * as in the UI spec: */
- g_signal_connect (G_OBJECT (self->combo_incoming_servertype), "changed",
- G_CALLBACK (on_combo_servertype_changed), self);
-
- /* The secure connection widgets: */
+ /* The secure connection widgets: */
+ /* This will be filled by update_incoming_server_security_choices(). */
if (!self->combo_incoming_security)
self->combo_incoming_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ());
- update_incoming_server_security_choices (self);
- easysetup_serversecurity_combo_box_set_active_serversecurity (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), MODEST_PROTOCOL_SECURITY_NONE);
- caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"),
+ 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)
+ self->entry_incoming_port = GTK_WIDGET (gtk_entry_new ());
+ 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);
+ /* The secure authentication widgets: */
if(!self->checkbox_incoming_auth)
self->checkbox_incoming_auth =
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_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data)
+{
+ ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ /* 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
-on_smtp_servers_window_hide (GtkWindow *window, gpointer user_data)
+on_combo_outgoing_auth_changed (GtkComboBox *widget, gpointer user_data)
{
- /* Destroy the window when it is closed: */
- gtk_widget_destroy (GTK_WIDGET (window));
+ ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+
+ ModestProtocol protocol_security =
+ easysetup_secureauth_combo_box_get_active_secureauth (
+ EASYSETUP_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth));
+ const gboolean secureauth_used = protocol_security != MODEST_PROTOCOL_AUTH_NONE;
+
+ gtk_widget_set_sensitive (self->caption_outgoing_username, secureauth_used);
+ gtk_widget_set_sensitive (self->caption_outgoing_password, secureauth_used);
}
static void
-on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data)
+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));
- ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ 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);
- /* 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);
+ 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);
+
+ /* The secure authentication widgets: */
+ if (!self->combo_outgoing_auth)
+ self->combo_outgoing_auth = GTK_WIDGET (easysetup_secureauth_combo_box_new ());
+ 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);
- set_default_custom_servernames (self);
- /* The secure connection widgets: */
+ /* Dim the outgoing username and password when no secure authentication is used, as per the UI spec: */
+ g_signal_connect (G_OBJECT (self->combo_outgoing_auth), "changed", (GCallback)on_combo_outgoing_auth_changed, self);
+
+ /* The username widgets: */
+ self->entry_outgoing_username = GTK_WIDGET (easysetup_validating_entry_new ());
+ 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);
+
+ /* Prevent the use of some characters in the username,
+ * as required by our UI specification: */
+ easysetup_validating_entry_set_unallowed_characters_whitespace (
+ EASYSETUP_VALIDATING_ENTRY (self->entry_outgoing_username));
+
+ /* Set max length as in the UI spec:
+ * 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_outgoing_username), 64);
+
+ /* The password widgets: */
+ self->entry_outgoing_password = gtk_entry_new ();
+ gtk_entry_set_visibility (GTK_ENTRY (self->entry_outgoing_password), FALSE);
+ /* gtk_entry_set_invisible_char (GTK_ENTRY (self->entry_outgoing_password), '*'); */
+ 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);
+
+ /* The secure connection widgets: */
+ /* This will be filled and set with easysetup_serversecurity_combo_box_fill()
+ * and easysetup_serversecurity_combo_box_set_active_serversecurity().
+ */
if (!self->combo_outgoing_security)
self->combo_outgoing_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ());
- easysetup_serversecurity_combo_box_fill (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security), MODEST_PROTOCOL_TRANSPORT_SMTP);
- easysetup_serversecurity_combo_box_set_active_serversecurity (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security), MODEST_PROTOCOL_SECURITY_NONE);
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);
- /* The secure authentication widgets: */
- if (!self->combo_outgoing_auth)
- self->combo_outgoing_auth = GTK_WIDGET (easysetup_secureauth_combo_box_new ());
- 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);
+ /* 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)
+ self->entry_outgoing_port = GTK_WIDGET (gtk_entry_new ());
+ 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)
return GTK_WIDGET (box);
}
+static gboolean
+check_data (ModestAccountSettingsDialog *self)
+{
+ /* Check that the title is not already in use: */
+ 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_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_title);
+
+ if (name_in_use) {
+ /* Warn the user via a dialog: */
+ show_error (GTK_WINDOW (self), _("mail_ib_account_name_already_existing"));
+
+ return FALSE;
+ }
+ }
+
+ /* Check that the email address is valud: */
+ const gchar* email_address = gtk_entry_get_text (GTK_ENTRY (self->entry_user_email));
+ if ((!email_address) || (strlen(email_address) == 0))
+ return FALSE;
+
+ if (!modest_text_utils_validate_email_address (email_address)) {
+ /* Warn the user via a dialog: */
+ show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));
+
+ /* Return focus to the email address entry: */
+ gtk_widget_grab_focus (self->entry_user_email);
+
+ return FALSE;
+ }
+
+ /* TODO: The UI Spec wants us to check that the servernames are valid,
+ * but does not specify how.
+ */
+
+ return TRUE;
+}
/*
*/
static void
{
ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (wizard_dialog);
enable_buttons (self);
+
+ gboolean prevent_response = FALSE;
+
+ /* Warn about unsaved changes: */
+ if (response_id == GTK_RESPONSE_CANCEL && self->modified) {
+ GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (GTK_WINDOW (self),
+ (GtkDialogFlags)0,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_OK_CANCEL, /* TODO: These button names are ambiguous, and not specified in the UI specification. */
+ _("imum_nc_wizard_confirm_lose_changes") ));
+
+ const gint dialog_response = gtk_dialog_run (dialog);
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+
+ if (dialog_response != GTK_RESPONSE_OK)
+ prevent_response = TRUE;
+ }
+ /* Check for invalid input: */
+ else if (!check_data (self)) {
+ prevent_response = TRUE;
+ }
+
+ if (prevent_response) {
+ /* This is a nasty hack. murrayc. */
+ /* Don't let the dialog close */
+ 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)
+ show_ok (GTK_WINDOW (self), _("mcen_ib_advsetup_settings_saved"));
+ else
+ show_error (GTK_WINDOW (self), _("mail_ib_setting_failed"));
+ }
}
static void
gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (notebook));
gtk_widget_show (GTK_WIDGET (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);
+
/* Connect to the dialog's response signal: */
- g_signal_connect_after (G_OBJECT (self), "response",
- G_CALLBACK (on_response), self);
+ /* We use connect-before
+ * so we can stop the signal emission,
+ * to stop the default signal handler from closing the dialog.
+ */
+ g_signal_connect (G_OBJECT (self), "response",
+ G_CALLBACK (on_response), self);
+
+ self->modified = FALSE;
}
ModestAccountSettingsDialog*
*/
void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialog *dialog, const gchar* account_name)
{
+ if (!account_name)
+ return;
+
+ /* 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;
+ }
+ /* 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);
-}
-static gchar*
-util_get_default_servername_from_email_address (const gchar* email_address, ModestProtocol servertype)
-{
- if (!email_address)
- return NULL;
+ if (!(account_data->store_account)) {
+ g_printerr ("modest: account has no stores: %s\n", account_name);
+ return;
+ }
+
+ /* Show the account data in the widgets: */
- gchar* at = g_utf8_strchr (email_address, -1, '@');
- if (!at || (g_utf8_strlen (at, -1) < 2))
- return NULL;
+ /* 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 : "");
- gchar* domain = g_utf8_next_char (at);
- if(!domain)
- return NULL;
+ gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_name),
+ account_data->fullname ? account_data->fullname : "");
+ gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_email),
+ account_data->email ? account_data->email : "");
- const gchar* hostname = NULL;
- if (servertype == MODEST_PROTOCOL_STORE_POP)
- hostname = "pop";
- else if (servertype == MODEST_PROTOCOL_STORE_IMAP)
- hostname = "imap";
- else if (servertype == MODEST_PROTOCOL_TRANSPORT_SMTP)
- hostname = "smtp";
+ 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);
- if (!hostname)
- return NULL;
+ 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);
+
+ /* 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);
+ }
- return g_strdup_printf ("%s.%s", hostname, domain);
-}
-
-/* Add a number to the end of the text, or increment a number that is already there.
- */
-static gchar*
-util_increment_name (const gchar* text)
-{
- /* Get the end character,
- * also doing a UTF-8 validation which is required for using g_utf8_prev_char().
- */
- const gchar* end = NULL;
- if (!g_utf8_validate (text, -1, &end))
- return NULL;
-
- if (!end)
- return NULL;
-
- --end; /* Go to before the null-termination. */
-
- /* Look at each UTF-8 characer, starting at the end: */
- const gchar* p = end;
- const gchar* alpha_end = NULL;
- while (p)
- {
- /* Stop when we reach the first character that is not a numeric digit: */
- const gunichar ch = g_utf8_get_char (p);
- if (!g_unichar_isdigit (ch)) {
- alpha_end = p;
- break;
- }
-
- p = g_utf8_prev_char (p);
- }
-
- if(!alpha_end) {
- /* The text must consist completely of numeric digits. */
- alpha_end = text;
- }
- else
- ++alpha_end;
-
- /* Intepret and increment the number, if any: */
- gint num = atol (alpha_end);
- ++num;
-
- /* Get the name part: */
- gint name_len = alpha_end - text;
- gchar *name_without_number = g_malloc(name_len + 1);
- memcpy (name_without_number, text, name_len);
- name_without_number[name_len] = 0;\
-
- /* Concatenate the text part and the new number: */
- gchar *result = g_strdup_printf("%s%d", name_without_number, num);
- g_free (name_without_number);
-
- return result;
-}
-
-static void set_default_custom_servernames (ModestAccountSettingsDialog *account_wizard)
-{
- if (!account_wizard->entry_incomingserver)
- return;
+ 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_user_password),
+ incoming_account->password ? incoming_account->password : "");
+
+ gtk_entry_set_text( GTK_ENTRY (dialog->entry_incomingserver),
+ incoming_account->hostname ? incoming_account->hostname : "");
+
+ 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);
- /* Set a default domain for the server, based on the email address,
- * if no server name was already specified.
- */
- const gchar* incoming_existing = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_incomingserver));
- if ((!incoming_existing || (strlen(incoming_existing) == 0))
- && account_wizard->entry_user_email) {
- const ModestProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
- EASYSETUP_SERVERTYPE_COMBO_BOX (account_wizard->combo_incoming_servertype));
- const gchar* email_address = gtk_entry_get_text (GTK_ENTRY(account_wizard->entry_user_email));
-
- gchar* servername = util_get_default_servername_from_email_address (email_address, protocol);
- gtk_entry_set_text (GTK_ENTRY (account_wizard->entry_incomingserver), servername);
- g_free (servername);
+ 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;
+ gchar *password;
+ time_t last_updated;
+ GSList *options;
+ */
+
}
- /* Set a default domain for the server, based on the email address,
- * if no server name was already specified.
- */
- const gchar* outgoing_existing = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_outgoingserver));
- if ((!outgoing_existing || (strlen(outgoing_existing) == 0))
- && account_wizard->entry_user_email) {
- const gchar* email_address = gtk_entry_get_text (GTK_ENTRY(account_wizard->entry_user_email));
-
- gchar* servername = util_get_default_servername_from_email_address (email_address, MODEST_PROTOCOL_TRANSPORT_SMTP);
- gtk_entry_set_text (GTK_ENTRY (account_wizard->entry_outgoingserver), servername);
- g_free (servername);
+ ModestServerAccountData *outgoing_account = account_data->transport_account;
+ if (outgoing_account) {
+ gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoingserver),
+ outgoing_account->hostname ? outgoing_account->hostname : "");
+
+ 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 : "");
+
+ /* 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), 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);
+
+ /* 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);
+
+ 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);
}
+
+ /* 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;
}
-#if 0
static gboolean
-on_before_next (GtkDialog *dialog, GtkWidget *current_page, GtkWidget *next_page)
+save_configuration (ModestAccountSettingsDialog *dialog)
{
- ModestAccountSettingsDialog *account_wizard = MODEST_ACCOUNT_SETTINGS_DIALOG (dialog);
+ g_assert (dialog->account_name);
- /* Do extra validation that couldn't be done for every key press,
- * either because it was too slow,
- * or because it requires interaction:
- */
- if (current_page == account_wizard->page_account_details) {
- /* Check that the title is not already in use: */
- const gchar* account_name = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_account_title));
- if ((!account_name) || (strlen(account_name) == 0))
- return FALSE;
-
- gboolean name_in_use = FALSE;
- name_in_use = modest_account_mgr_account_exists (account_wizard->account_manager,
- account_name, FALSE /* server_account */);
+ const gchar* account_name = dialog->account_name;
- if (name_in_use) {
- /* Warn the user via a dialog: */
- show_error (GTK_WINDOW (account_wizard), _("mail_ib_account_name_already_existing."));
-
- return FALSE;
- }
- }
- else if (current_page == account_wizard->page_user_details) {
- /* Check that the email address is valud: */
- const gchar* email_address = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_user_email));
- if ((!email_address) || (strlen(email_address) == 0))
- return FALSE;
+ /* 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* 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;
+
+ 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,
+ MODEST_ACCOUNT_LEAVE_ON_SERVER, leave_on_server, FALSE /* not server account */);
+ if (!test)
+ return FALSE;
- if (!modest_text_utils_validate_email_address (email_address)) {
- /* Warn the user via a dialog: */
- show_error (GTK_WINDOW (account_wizard), _("mcen_ib_invalid_email"));
-
- /* Return focus to the email address entry: */
- gtk_widget_grab_focus (account_wizard->entry_user_email);
-
- return FALSE;
- }
+ /* 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;
+
+ const gchar* username = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_username));
+ test = modest_account_mgr_set_string (dialog->account_manager, incoming_account_name,
+ MODEST_ACCOUNT_USERNAME, username, TRUE /* server account */);
+ if (!test)
+ return FALSE;
+
+ const gchar* password = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_password));
+ test = modest_account_mgr_set_string (dialog->account_manager, incoming_account_name,
+ MODEST_ACCOUNT_PASSWORD, password, TRUE /* server account */);
+ if (!test)
+ return FALSE;
+
+ 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);
+
+ 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 */);
- /* Make sure that the subsequent pages are appropriate for the provider choice. */
- create_subsequent_pages (account_wizard);
- }
+ g_free (incoming_account_name);
- /* TODO: The UI Spec wants us to check that the servernames are valid,
- * but does not specify how.
- */
-
- if(next_page == account_wizard->page_incoming) {
- set_default_custom_servernames (account_wizard);
- }
- else if (next_page == account_wizard->page_outgoing) {
- set_default_custom_servernames (account_wizard);
- }
+ /* 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);
- /* If this is the last page, and this is a click on Finish,
- * then attempt to create the dialog.
- */
- if(!next_page) /* This is NULL when this is a click on Finish. */
- {
- create_account (account_wizard);
- }
+ 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;
+
+ username = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoing_username));
+ test = modest_account_mgr_set_string (dialog->account_manager, outgoing_account_name,
+ MODEST_ACCOUNT_USERNAME, username, TRUE /* server account */);
+ if (!test)
+ return FALSE;
+
+ password = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoing_password));
+ test = modest_account_mgr_set_string (dialog->account_manager, outgoing_account_name,
+ MODEST_ACCOUNT_PASSWORD, password, TRUE /* server account */);
+ if (!test)
+ return FALSE;
+ 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);
- return TRUE;
+ 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);
+
+
+ /* Set the changed account title last, to simplify the previous code: */
+ const gchar* account_title = gtk_entry_get_text (GTK_ENTRY (dialog->entry_account_title));
+ if ((!account_title) || (strlen(account_title) == 0))
+ return FALSE; /* Should be prevented already anyway. */
+
+ if (strcmp(account_title, account_name) != 0) {
+ /* Change the title: */
+ gboolean test = modest_account_mgr_set_string (dialog->account_manager, account_name,
+ MODEST_ACCOUNT_DISPLAY_NAME, account_title, FALSE /* not server account */);
+ if (!test)
+ return FALSE;
+ }
+
+ /* 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;
}
-#endif
-#if 0
static gboolean entry_is_empty (GtkWidget *entry)
{
if (!entry)
else
return FALSE;
}
-#endif
-#if 0
static void
-on_enable_buttons (GtkDialog *dialog, GtkWidget *current_page)
+enable_buttons (ModestAccountSettingsDialog *self)
{
- ModestAccountSettingsDialog *account_wizard = MODEST_ACCOUNT_SETTINGS_DIALOG (dialog);
+ gboolean enable_ok = TRUE;
- gboolean enable_next = TRUE;
- if (current_page == account_wizard->page_welcome) {
- enable_next = TRUE;
- }
- else if (current_page == account_wizard->page_account_details) {
- /* The account details title is mandatory: */
- if (entry_is_empty(account_wizard->entry_account_title))
- enable_next = FALSE;
- }
- else if (current_page == account_wizard->page_user_details) {
- /* The user details username is mandatory: */
- if (entry_is_empty(account_wizard->entry_user_username))
- enable_next = FALSE;
-
- /* The user details email address is mandatory: */
- if (enable_next && entry_is_empty (account_wizard->entry_user_email))
- enable_next = FALSE;
- }
- else if (current_page == account_wizard->page_incoming) {
- /* The custom incoming server is mandatory: */
- if (entry_is_empty(account_wizard->entry_incomingserver))
- enable_next = FALSE;
- }
+ /* The account details title is mandatory: */
+ if (entry_is_empty(self->entry_account_title))
+ enable_ok = FALSE;
+
+ /* The user details username is mandatory: */
+ if (entry_is_empty(self->entry_user_username))
+ enable_ok = FALSE;
+
+ /* The user details email address is mandatory: */
+ if (enable_ok && entry_is_empty (self->entry_user_email))
+ enable_ok = FALSE;
+
+ /* The custom incoming server is mandatory: */
+ if (entry_is_empty(self->entry_incomingserver))
+ enable_ok = FALSE;
/* Enable the buttons,
* identifying them via their associated response codes:
*/
- GtkDialog *dialog_base = GTK_DIALOG (dialog);
+ GtkDialog *dialog_base = GTK_DIALOG (self);
gtk_dialog_set_response_sensitive (dialog_base,
- MODEST_WIZARD_DIALOG_NEXT,
- enable_next);
-
- /* Disable the Finish button until we are on the last page,
- * because HildonWizardDialog enables this for all but the first page: */
- GtkNotebook *notebook = NULL;
- g_object_get (dialog_base, "wizard-notebook", ¬ebook, NULL);
-
- gint current = gtk_notebook_get_current_page (notebook);
- gint last = gtk_notebook_get_n_pages (notebook) - 1;
- gboolean is_last = (current == last);
-
- if(!is_last) {
- gtk_dialog_set_response_sensitive (dialog_base,
- MODEST_WIZARD_DIALOG_FINISH,
- FALSE);
- }
+ GTK_RESPONSE_OK,
+ enable_ok);
}
-#endif
static void
modest_account_settings_dialog_class_init (ModestAccountSettingsDialogClass *klass)
object_class->finalize = modest_account_settings_dialog_finalize;
}
-#if 0
static void
show_error (GtkWindow *parent_window, const gchar* text)
{
gtk_dialog_run (dialog);
gtk_widget_destroy (GTK_WIDGET (dialog));
}
-#endif
-#if 0
-/** Attempt to create the account from the information that the user has entered.
- * @result: TRUE if the account was successfully created.
- */
-gboolean
-create_account (ModestAccountSettingsDialog *self)
+static void
+show_ok (GtkWindow *parent_window, const gchar* text)
{
- ModestAccountSettingsDialogPrivate *priv = ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
-
- const gchar* account_name = gtk_entry_get_text (GTK_ENTRY (self->entry_account_title));
-
- /* Some checks: */
- if (!account_name)
- return FALSE;
-
- /* We should have checked for this already,
- * and changed that name accordingly,
- * but let's check again just in case:
- */
- if (modest_account_mgr_account_exists (self->account_manager, account_name, FALSE))
- return FALSE;
-
- /* username and password (for both incoming and outgoing): */
- const gchar* username = gtk_entry_get_text (GTK_ENTRY (self->entry_user_username));
- const gchar* password = gtk_entry_get_text (GTK_ENTRY (self->entry_user_password));
-
- /* Incoming server: */
- /* Note: We need something as default for the ModestProtocol values,
- * or modest_account_mgr_add_server_account will fail. */
- gchar* servername_incoming = NULL;
- ModestProtocol protocol_incoming = MODEST_PROTOCOL_STORE_POP;
- ModestProtocol protocol_security_incoming = MODEST_PROTOCOL_SECURITY_NONE;
- ModestProtocol protocol_authentication_incoming = MODEST_PROTOCOL_AUTH_NONE;
-
-
- /* Use custom pages because no preset was specified: */
- servername_incoming = g_strdup (gtk_entry_get_text (GTK_ENTRY (self->entry_incomingserver) ));
-
- protocol_incoming = easysetup_servertype_combo_box_get_active_servertype (
- EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype));
-
- protocol_security_incoming = easysetup_serversecurity_combo_box_get_active_serversecurity (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security));
-
- protocol_authentication_incoming = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->checkbox_incoming_auth))
- ? MODEST_PROTOCOL_AUTH_PASSWORD
- : MODEST_PROTOCOL_AUTH_NONE;
-
-
-
- /* First we add the 2 server accounts, and then we add the account that uses them.
- * If we don't do it in this order then we will experience a crash. */
-
- /* Add a (incoming) server account, to be used by the account: */
- gchar *store_name = g_strconcat (account_name, "_store", NULL);
- gboolean created = modest_account_mgr_add_server_account (self->account_manager,
- store_name,
- servername_incoming,
- username, password,
- protocol_incoming,
- protocol_security_incoming,
- protocol_authentication_incoming);
-
- g_free (servername_incoming);
-
- if (!created) {
- /* TODO: Provide a Logical ID for the text: */
- show_error (GTK_WINDOW (self), _("An error occurred while creating the incoming account."));
- return FALSE;
- }
-
- /* Sanity check: */
- /* There must be at least one account now: */
- GSList *account_names = modest_account_mgr_account_names (self->account_manager);
- if(account_names != NULL)
- {
- g_warning ("modest_account_mgr_account_names() returned NULL after adding an account.");
- }
- g_slist_free (account_names);
-
-
- /* Outgoing server: */
- gchar* servername_outgoing = NULL;
- ModestProtocol protocol_outgoing = MODEST_PROTOCOL_STORE_POP;
- ModestProtocol protocol_security_outgoing = MODEST_PROTOCOL_SECURITY_NONE;
- ModestProtocol protocol_authentication_outgoing = MODEST_PROTOCOL_AUTH_NONE;
-
-
- /* Use custom pages because no preset was specified: */
- servername_outgoing = g_strdup (gtk_entry_get_text (GTK_ENTRY (self->entry_outgoingserver) ));
-
- protocol_outgoing = MODEST_PROTOCOL_TRANSPORT_SMTP; /* It's always SMTP for outgoing. */
-
- protocol_security_outgoing = easysetup_serversecurity_combo_box_get_active_serversecurity (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security));
-
- protocol_authentication_outgoing = easysetup_secureauth_combo_box_get_active_secureauth (
- EASYSETUP_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth));
-
- /* TODO:
- gboolean specific = gtk_toggle_button_get_active (
- GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific));
- */
-
-
- /* Add a (outgoing) server account to be used by the account: */
- gchar *transport_name = g_strconcat (account_name, "_transport", NULL); /* What is this good for? */
- created = modest_account_mgr_add_server_account (self->account_manager,
- transport_name,
- servername_outgoing,
- username, password,
- protocol_outgoing,
- protocol_security_outgoing,
- protocol_authentication_outgoing);
-
- g_free (servername_outgoing);
-
- if (!created) {
- /* TODO: Provide a Logical ID for the text: */
- show_error (GTK_WINDOW (self), _("An error occurred while creating the outgoing account."));
- return FALSE;
- }
-
-
- /* Create the account, which will contain the two "server accounts": */
- created = modest_account_mgr_add_account (self->account_manager, account_name,
- store_name, /* The name of our POP/IMAP server account. */
- transport_name /* The name of our SMTP server account. */);
- g_free (store_name);
- g_free (transport_name);
-
- if (!created) {
- /* TODO: Provide a Logical ID for the text: */
- show_error (GTK_WINDOW (self), _("An error occurred while creating the account."));
- return FALSE;
- }
-
- return FALSE;
+ 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));
}
-#endif
+
projects / modest / blobdiff