#include <config.h>
#endif
-#define EXAMPLE_EMAIL_ADDRESS "first.last@provider.com"
-
G_DEFINE_TYPE (ModestEasysetupWizardDialog, modest_easysetup_wizard_dialog, MODEST_TYPE_WIZARD_DIALOG);
#define WIZARD_DIALOG_GET_PRIVATE(o) \
gboolean dirty;
};
+static gboolean
+on_delete_event (GtkWidget *widget,
+ GdkEvent *event,
+ ModestEasysetupWizardDialog *wizard)
+{
+ gtk_dialog_response (GTK_DIALOG (wizard), GTK_RESPONSE_CANCEL);
+ return TRUE;
+}
+
static void
on_easysetup_changed(GtkWidget* widget, ModestEasysetupWizardDialog* wizard)
{
priv->dirty = TRUE;
/* Fill the providers combo, based on the selected country: */
- gint mcc = easysetup_country_combo_box_get_active_country_mcc (
- EASYSETUP_COUNTRY_COMBO_BOX (self->combo_account_country));
- easysetup_provider_combo_box_fill (
- EASYSETUP_PROVIDER_COMBO_BOX (self->combo_account_serviceprovider), priv->presets, mcc);
+ if (priv->presets != NULL) {
+ gint mcc = easysetup_country_combo_box_get_active_country_mcc (
+ EASYSETUP_COUNTRY_COMBO_BOX (self->combo_account_country));
+ easysetup_provider_combo_box_fill (
+ EASYSETUP_PROVIDER_COMBO_BOX (self->combo_account_serviceprovider), priv->presets, mcc);
+ }
}
static void
domain_name = modest_presets_get_domain (priv->presets, provider_id);
if(!domain_name)
- domain_name = g_strdup (EXAMPLE_EMAIL_ADDRESS);
+ domain_name = g_strdup (MODEST_EXAMPLE_EMAIL_ADDRESS);
if (self->entry_user_email)
gtk_entry_set_text (GTK_ENTRY (self->entry_user_email), domain_name);
/* The service provider widgets: */
self->combo_account_serviceprovider = GTK_WIDGET (easysetup_provider_combo_box_new ());
+ gtk_widget_set_size_request (self->combo_account_serviceprovider, 320, -1);
caption = create_caption_new_with_asterisk (self, sizegroup, _("mcen_fi_serviceprovider"),
self->combo_account_serviceprovider, NULL, HILDON_CAPTION_OPTIONAL);
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);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
g_signal_connect(G_OBJECT(self->entry_user_email), "changed",
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 ());
+ 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_asterisk (self, sizegroup,
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
- if(!self->entry_incomingserver)
- {
- self->entry_incomingserver = gtk_entry_new ();
- g_signal_connect(G_OBJECT(self->entry_incomingserver), "changed",
- G_CALLBACK(on_easysetup_changed), self);
- }
+ self->entry_incomingserver = gtk_entry_new ();
+ g_signal_connect(G_OBJECT(self->entry_incomingserver), "changed", G_CALLBACK(on_easysetup_changed), self);
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_incomingserver), HILDON_GTK_INPUT_MODE_FULL);
set_default_custom_servernames (self);
- if (self->caption_incoming)
- gtk_widget_destroy (self->caption_incoming);
-
/* The caption title will be updated in update_incoming_server_title().
* so this default text will never be seen: */
/* (Note: Changing the title seems pointless. murrayc) */
G_CALLBACK (on_entry_incoming_servername_changed), self);
/* The secure connection widgets: */
- if (!self->combo_incoming_security)
- self->combo_incoming_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
+ self->combo_incoming_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
update_incoming_server_security_choices (self);
modest_serversecurity_combo_box_set_active_serversecurity (
MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), MODEST_PROTOCOL_CONNECTION_NORMAL);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
- if(!self->checkbox_incoming_auth)
- {
- self->checkbox_incoming_auth = gtk_check_button_new ();
- g_signal_connect (G_OBJECT (self->checkbox_incoming_auth), "toggled",
+ self->checkbox_incoming_auth = gtk_check_button_new ();
+ g_signal_connect (G_OBJECT (self->checkbox_incoming_auth), "toggled",
G_CALLBACK (on_easysetup_changed), self);
- }
caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"),
self->checkbox_incoming_auth, NULL, HILDON_CAPTION_OPTIONAL);
/* 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);
}
GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* The outgoing server widgets: */
- if (!self->entry_outgoingserver)
- {
- self->entry_outgoingserver = gtk_entry_new ();
- g_signal_connect (G_OBJECT (self->entry_outgoingserver), "changed",
- G_CALLBACK (on_easysetup_changed), self);
- }
+ self->entry_outgoingserver = gtk_entry_new ();
+ g_signal_connect (G_OBJECT (self->entry_outgoingserver), "changed",
+ G_CALLBACK (on_easysetup_changed), self);
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL);
GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup,
set_default_custom_servernames (self);
/* The secure connection widgets: */
- if (!self->combo_outgoing_security)
- {
- self->combo_outgoing_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
- g_signal_connect (G_OBJECT (self->combo_outgoing_security), "changed",
+ self->combo_outgoing_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
+ g_signal_connect (G_OBJECT (self->combo_outgoing_security), "changed",
G_CALLBACK (on_easysetup_changed), self);
- }
modest_serversecurity_combo_box_fill (
MODEST_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security), MODEST_PROTOCOL_TRANSPORT_SMTP);
modest_serversecurity_combo_box_set_active_serversecurity (
gtk_widget_show (caption);
/* The secure authentication widgets: */
- if (!self->combo_outgoing_auth)
- {
- self->combo_outgoing_auth = GTK_WIDGET (modest_secureauth_combo_box_new ());
- g_signal_connect (G_OBJECT (self->combo_outgoing_auth), "changed",
+ self->combo_outgoing_auth = GTK_WIDGET (modest_secureauth_combo_box_new ());
+ g_signal_connect (G_OBJECT (self->combo_outgoing_auth), "changed",
G_CALLBACK (on_easysetup_changed), self);
- }
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);
gtk_widget_show (separator);
/* connection-specific checkbox: */
- if (!self->checkbox_outgoing_smtp_specific) {
- self->checkbox_outgoing_smtp_specific = gtk_check_button_new ();
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific),
- FALSE);
- g_signal_connect (G_OBJECT (self->checkbox_outgoing_smtp_specific), "toggled",
- G_CALLBACK (on_easysetup_changed), self);
+ self->checkbox_outgoing_smtp_specific = gtk_check_button_new ();
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific),
+ FALSE);
+ g_signal_connect (G_OBJECT (self->checkbox_outgoing_smtp_specific), "toggled",
+ G_CALLBACK (on_easysetup_changed), self);
- }
caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_connection_smtp"),
self->checkbox_outgoing_smtp_specific, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->checkbox_outgoing_smtp_specific);
gtk_widget_show (caption);
/* Connection-specific SMTP-Severs Edit button: */
- if (!self->button_outgoing_smtp_servers)
- self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit"));
+ self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit"));
caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_optional_smtp"),
self->button_outgoing_smtp_servers, NULL, HILDON_CAPTION_OPTIONAL);
hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE);
ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
modest_account_settings_dialog_set_account_name (dialog, self->saved_account_name);
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog));
gtk_dialog_run (GTK_DIALOG (dialog));
{
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
+ GtkWidget *button_edit = gtk_button_new_with_label (_("mcen_bd_edit"));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_widget_set_size_request (label, 600, -1);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
- if (!self->button_edit)
- self->button_edit = gtk_button_new_with_label (_("mcen_bd_edit"));
GtkWidget *caption = hildon_caption_new (NULL, _("mcen_fi_advanced_settings"),
- self->button_edit, NULL, HILDON_CAPTION_OPTIONAL);
+ button_edit, NULL, HILDON_CAPTION_OPTIONAL);
hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE);
- gtk_widget_show (self->button_edit);
+ gtk_widget_show (button_edit);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
- g_signal_connect (G_OBJECT (self->button_edit), "clicked",
+ g_signal_connect (G_OBJECT (button_edit), "clicked",
G_CALLBACK (on_button_edit_advanced_settings), self);
gtk_widget_show (GTK_WIDGET (box));
if (priv->dirty) {
GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self),
_("imum_nc_wizard_confirm_lose_changes")));
- /* TODO: These button names will be ambiguous, and not specified in the UI specification. */
+ /* TODO: These button names will be ambiguous, and not
+ * specified in the UI specification. */
const gint dialog_response = gtk_dialog_run (dialog);
+ self->combo_account_country = NULL;
gtk_widget_destroy (GTK_WIDGET (dialog));
if (dialog_response != GTK_RESPONSE_OK) {
}
}
+typedef struct IdleData {
+ ModestEasysetupWizardDialog *dialog;
+ ModestPresets *presets;
+} IdleData;
+
+gboolean
+presets_idle (gpointer userdata)
+{
+ IdleData *idle_data = (IdleData *) userdata;
+ ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (idle_data->dialog);
+ ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE (self);
+
+ g_assert (idle_data->presets);
+
+ gdk_threads_enter ();
+
+ priv->presets = idle_data->presets;
+
+ if (self->combo_account_country) {
+ gint mcc = easysetup_country_combo_box_get_active_country_mcc (
+ EASYSETUP_COUNTRY_COMBO_BOX (self->combo_account_country));
+ easysetup_provider_combo_box_fill (
+ EASYSETUP_PROVIDER_COMBO_BOX (self->combo_account_serviceprovider),
+ priv->presets, mcc);
+ }
+
+ priv->dirty = FALSE;
+
+ g_object_unref (idle_data->dialog);
+ g_free (idle_data);
+
+ gdk_threads_leave ();
+
+ return FALSE;
+}
+
+gpointer
+presets_loader (gpointer userdata)
+{
+ ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (userdata);
+ ModestPresets *presets = NULL;
+ IdleData *idle_data;
+
+ const gchar* path = NULL;
+ const gchar* path1 = MODEST_PROVIDER_DATA_FILE;
+ const gchar* path2 = MODEST_MAEMO_PROVIDER_DATA_FILE;
+
+ if (access(path1, R_OK) == 0)
+ path = path1;
+ else if (access(path2, R_OK) == 0)
+ path = path2;
+ else {
+ g_warning ("%s: neither '%s' nor '%s' is a readable provider data file",
+ __FUNCTION__, path1, path2);
+ return NULL;
+ }
+
+ presets = modest_presets_new (path);
+ if (!presets) {
+ g_warning ("%s: failed to parse '%s'", __FUNCTION__, path);
+ return NULL;
+ }
+
+ idle_data = g_new0 (IdleData, 1);
+ idle_data->dialog = self;
+ idle_data->presets = presets;
+
+ g_idle_add (presets_idle, idle_data);
+
+ return NULL;
+}
+
static void
modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self)
{
/* Read in the information about known service providers: */
ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE (self);
- const gchar* filepath = MODEST_PROVIDERS_DATA_PATH; /* Defined in config.h */
- priv->presets = modest_presets_new (filepath);
- if (!(priv->presets)) {
- g_warning ("Could not locate the official provider data keyfile from %s", filepath);
- }
-
- g_assert(priv->presets);
-
/* The server fields did not have been manually changed yet */
priv->server_changes = 0;
g_signal_connect (G_OBJECT (self), "response",
G_CALLBACK (on_response_before), self);
+ g_signal_connect (G_OBJECT (self), "delete-event",
+ G_CALLBACK (on_delete_event), self);
+
/* Reset dirty, because there was no user input until now */
priv->dirty = FALSE;
* 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));
+
+ /* Load provider presets */
+ g_object_ref (self);
+ g_thread_create (presets_loader, self, FALSE, NULL);
+
+ hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_wizardwelcome",
+ modest_maemo_utils_get_osso_context());
}
ModestEasysetupWizardDialog*
if(self->page_custom_incoming) {
gtk_widget_destroy (self->page_custom_incoming);
self->page_custom_incoming = NULL;
+ self->combo_incoming_servertype = NULL;
+ self->caption_incoming = NULL;
+ self->entry_incomingserver = NULL;
+ self->combo_incoming_security = NULL;
+ self->checkbox_incoming_auth = NULL;
}
if(self->page_custom_outgoing) {
gtk_widget_destroy (self->page_custom_outgoing);
self->page_custom_outgoing = NULL;
+ self->entry_outgoingserver = NULL;
+ self->combo_outgoing_security = NULL;
+ self->combo_outgoing_auth = NULL;
+ self->checkbox_outgoing_smtp_specific = NULL;
+ self->button_outgoing_smtp_servers = NULL;
}
if(self->page_complete_customsetup) {
create_account (ModestEasysetupWizardDialog *self, gboolean enabled)
{
ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE (self);
-
+ guint special_port;
gchar* display_name = get_entered_account_title (self);
/* Some checks: */
provider_id,
TRUE /* incoming */);
- g_warning ("security incoming: %x", security_incoming);
/* We don't check for SMTP here as that is impossible for an incoming server. */
if (servertype_incoming == MODEST_PRESETS_SERVER_TYPE_IMAP) {
gchar *store_name = modest_account_mgr_get_unused_account_name (self->account_manager,
store_name_start, TRUE /* server account */);
g_free (store_name_start);
+
+ /* we check if there is a *special* port */
+ special_port = modest_presets_get_port (priv->presets, provider_id,
+ TRUE /* incoming */);
+ if (special_port != 0)
+ serverport_incoming = special_port;
+
gboolean created = modest_account_mgr_add_server_account (self->account_manager,
store_name,
servername_incoming,
modest_presets_get_info_server_security (priv->presets, provider_id,
FALSE /* incoming */);
- /* TODO: The secure-smtp information in the presets data is currently wrong,
- * so we choose a reasonable default. Remove this when the presets data is corrected: */
- security_outgoing = security_outgoing & MODEST_PRESETS_SECURITY_SECURE_SMTP;
-
protocol_security_outgoing = MODEST_PROTOCOL_CONNECTION_NORMAL;
if (security_outgoing & MODEST_PRESETS_SECURITY_SECURE_SMTP) {
/* printf("DEBUG: %s: using secure SMTP\n", __FUNCTION__); */
/* printf("DEBUG: %s: using non-secure SMTP\n", __FUNCTION__); */
protocol_authentication_outgoing = MODEST_PROTOCOL_AUTH_NONE;
}
- }
- else {
+ } else {
/* Use custom pages because no preset was specified: */
servername_outgoing = g_strdup (gtk_entry_get_text (GTK_ENTRY (self->entry_outgoingserver) ));
gchar *transport_name = modest_account_mgr_get_unused_account_name (self->account_manager,
transport_name_start, TRUE /* server account */);
g_free (transport_name_start);
+
+ /* we check if there is a *special* port */
+ special_port = modest_presets_get_port (priv->presets, provider_id,
+ FALSE /* incoming */);
+ if (special_port != 0)
+ serverport_outgoing = special_port;
+
created = modest_account_mgr_add_server_account (self->account_manager,
transport_name,
servername_outgoing,
projects / modest / blobdiff