/* The description widgets: */
priv->entry_account_title = GTK_WIDGET (modest_validating_entry_new ());
- g_signal_connect(G_OBJECT(priv->entry_account_title), "changed",
- G_CALLBACK(on_easysetup_changed), self);
+
/* Do use auto-capitalization: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_account_title),
HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
g_free (default_account_name);
default_account_name = NULL;
+ /* Connect signal after changing the text in the entry */
+ g_signal_connect(G_OBJECT(priv->entry_account_title), "changed",
+ G_CALLBACK(on_easysetup_changed), self);
+
priv->caption_account_title = create_captioned (self, title_sizegroup, value_sizegroup,
_("mcen_fi_account_title"), FALSE,
priv->entry_account_title);
{
ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
- ModestServertypePicker *picker;
- ModestProtocolType protocol_type;
priv->dirty = TRUE;
update_incoming_server_title (self);
/* Update security options if needed */
- picker = MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker);
- protocol_type = modest_servertype_picker_get_active_servertype (picker);
update_incoming_server_security_choices (self);
gtk_widget_show (priv->incoming_security);
gtk_widget_show (priv->incoming_servertype_picker);
priv->entry_incomingserver = hildon_entry_new (MODEST_EDITABLE_SIZE);
- g_signal_connect(G_OBJECT(priv->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 (priv->entry_incomingserver), HILDON_GTK_INPUT_MODE_FULL);
set_default_custom_servernames (self);
gtk_box_pack_start (GTK_BOX (box), priv->caption_incoming, FALSE, FALSE, 0);
gtk_widget_show (priv->caption_incoming);
- /* Change the caption title when the servertype changes,
- * as in the UI spec: */
- g_signal_connect (G_OBJECT (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (priv->incoming_servertype_picker))),
- "changed",
- G_CALLBACK (on_servertype_selector_changed), self);
-
/* Remember when the servername was changed manually: */
g_signal_connect (G_OBJECT (priv->entry_incomingserver), "changed",
G_CALLBACK (on_entry_incoming_servername_changed), self);
modest_servertype_picker_set_active_servertype (
MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker),
MODEST_PROTOCOLS_STORE_POP);
+ update_incoming_server_title (self);
+ update_incoming_server_security_choices (self);
+ set_default_custom_servernames (self);
+
+ /* Change the caption title when the servertype changes,
+ * as in the UI spec: */
+ g_signal_connect (G_OBJECT (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (priv->incoming_servertype_picker))),
+ "changed",
+ G_CALLBACK (on_servertype_selector_changed), self);
align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
+ /* Connect changed signals. We do it here after initializing everything */
+ g_signal_connect (G_OBJECT(priv->entry_incomingserver), "changed",
+ G_CALLBACK(on_easysetup_changed), self);
+
+
return GTK_WIDGET (pannable);
}
/* The outgoing server widgets: */
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
priv->entry_outgoingserver = hildon_entry_new (MODEST_EDITABLE_SIZE);
- g_signal_connect (G_OBJECT (priv->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 (priv->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL);
smtp_caption_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "\n<small>(SMTP)</small>", NULL);
_("mcen_fi_advsetup_connection_smtp"));
gtk_button_set_alignment (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific),
0.0, 0.5);
- g_signal_connect (G_OBJECT (priv->checkbox_outgoing_smtp_specific), "toggled",
- G_CALLBACK (on_easysetup_changed), self);
gtk_widget_show (priv->checkbox_outgoing_smtp_specific);
gtk_box_pack_start (GTK_BOX (box), priv->checkbox_outgoing_smtp_specific,
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
+ /* Connect changed signals. We do it here after initializing everything */
+ g_signal_connect (G_OBJECT (priv->entry_outgoingserver), "changed",
+ G_CALLBACK (on_easysetup_changed), self);
+ g_signal_connect (G_OBJECT (priv->checkbox_outgoing_smtp_specific), "toggled",
+ G_CALLBACK (on_easysetup_changed), self);
+
return GTK_WIDGET (pannable);
}
if (provider_id) {
ModestProtocolType transport_provider_server_type;
ModestProtocolType transport_provider_security;
+ gboolean is_secure;
/* Use presets */
transport_hostname = modest_presets_get_server (priv->presets, provider_id,
/* Note: We need something as default, or modest_account_mgr_add_server_account will fail. */
transport_protocol = transport_provider_server_type;
transport_security = transport_provider_security;
- if (transport_security == MODEST_PROTOCOLS_CONNECTION_SSL) {
- /* printf("DEBUG: %s: using secure SMTP\n", __FUNCTION__); */
- /* we check if there is a *special* port */
- special_port = modest_presets_get_port (priv->presets, provider_id,
- FALSE /* transport */);
- if (special_port != 0)
- transport_port = special_port;
- else
- transport_port = 465;
- transport_auth_protocol = MODEST_PROTOCOLS_AUTH_PASSWORD;
+ is_secure = modest_protocol_registry_protocol_type_is_secure (modest_runtime_get_protocol_registry (),
+ transport_security);
+
+ /* we check if there is a *special* port */
+ special_port = modest_presets_get_port (priv->presets, provider_id,
+ FALSE /* transport */);
+ if (special_port != 0) {
+ transport_port = special_port;
} else {
- /* printf("DEBUG: %s: using non-secure SMTP\n", __FUNCTION__); */
- transport_auth_protocol = MODEST_PROTOCOLS_AUTH_NONE;
+ gboolean use_alternate_port = FALSE;
+ if (transport_security == MODEST_PROTOCOLS_CONNECTION_SSL)
+ use_alternate_port = TRUE;
+ transport_port = get_port_from_protocol(transport_provider_server_type, use_alternate_port);
}
+ if (is_secure)
+ transport_auth_protocol = MODEST_PROTOCOLS_AUTH_PASSWORD;
+ else
+ transport_auth_protocol = MODEST_PROTOCOLS_AUTH_NONE;
+
modest_server_account_settings_set_security_protocol (transport_settings,
transport_security);
modest_server_account_settings_set_auth_protocol (transport_settings,
projects / modest / blobdiff