X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-easysetup-wizard-dialog.c;h=c81aa9060cc55f22f545e6b6c945b3f0563cf72c;hb=9c2a37dd25558a3a70d49388b63424bc96cf2cab;hp=80288d1f57202a1140b1eae922840d52548971f0;hpb=00d136e7daf1ac0831f0ed1fff3f68ddf5d36a21;p=modest
diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c
index 80288d1..c81aa90 100644
--- a/src/hildon2/modest-easysetup-wizard-dialog.c
+++ b/src/hildon2/modest-easysetup-wizard-dialog.c
@@ -71,7 +71,8 @@ G_DEFINE_TYPE (ModestEasysetupWizardDialog, modest_easysetup_wizard_dialog, MODE
MODEST_TYPE_EASYSETUP_WIZARD_DIALOG, \
ModestEasysetupWizardDialogPrivate))
-#define LABELS_WIDTH -1
+#define LABELS_WIDTH 480
+#define DIALOG_WIDTH LABELS_WIDTH + MODEST_MARGIN_DOUBLE
typedef struct _ModestEasysetupWizardDialogPrivate ModestEasysetupWizardDialogPrivate;
@@ -138,6 +139,9 @@ struct _ModestEasysetupWizardDialogPrivate
static void save_to_settings (ModestEasysetupWizardDialog *self);
static void real_enable_buttons (ModestWizardDialog *dialog, gboolean enable_next);
+static void on_save_settings (ModestWizardDialog *dialog);
+static GList* check_for_supported_auth_methods (ModestEasysetupWizardDialog* self);
+static gboolean check_has_supported_auth_methods(ModestEasysetupWizardDialog* self);
static gboolean
on_delete_event (GtkWidget *widget,
@@ -256,18 +260,56 @@ on_picker_button_value_changed (HildonPickerButton *widget, gpointer user_data)
invoke_enable_buttons_vfunc(self);
}
+static void
+on_serviceprovider_picker_button_value_changed (HildonPickerButton *widget, gpointer user_data)
+{
+ gchar* default_account_name_start;
+ gchar* default_account_name;
+ ModestEasysetupWizardDialog *self;
+ ModestEasysetupWizardDialogPrivate *priv;
+ ModestProviderPickerIdType provider_id_type;
+
+ self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
+ priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+
+ on_picker_button_value_changed (widget, user_data);
+
+ provider_id_type = modest_provider_picker_get_active_id_type (
+ MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker));
+ if (provider_id_type == MODEST_PROVIDER_PICKER_ID_OTHER) {
+ default_account_name_start = g_strdup (_("mcen_ia_emailsetup_defaultname"));
+ } else {
+ GtkWidget *selector;
+
+ selector = GTK_WIDGET (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (widget)));
+ default_account_name_start =
+ g_strdup (hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector)));
+
+ }
+ default_account_name = modest_account_mgr_get_unused_account_display_name (
+ priv->account_manager, default_account_name_start);
+ g_free (default_account_name_start);
+ default_account_name_start = NULL;
+
+ hildon_entry_set_text (HILDON_ENTRY (priv->entry_account_title), default_account_name);
+ g_free (default_account_name);
+}
+
/** This is a convenience function to create a caption containing a mandatory widget.
* When the widget is edited, the enable_buttons() vfunc will be called.
*/
static GtkWidget*
create_captioned (ModestEasysetupWizardDialog *self,
- GtkSizeGroup *group,
+ GtkSizeGroup *title_size_group,
+ GtkSizeGroup *value_size_group,
const gchar *value,
+ gboolean use_markup,
GtkWidget *control)
{
GtkWidget *result;
- result = modest_maemo_utils_create_captioned (group, value, control);
+ result = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
+ value, use_markup, control);
/* Connect to the appropriate changed signal for the widget,
* so we can ask for the prev/next buttons to be enabled/disabled appropriately:
@@ -293,6 +335,7 @@ create_page_welcome (ModestEasysetupWizardDialog *self)
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
/* So that it is not truncated: */
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
gtk_widget_show (GTK_WIDGET (box));
@@ -338,7 +381,7 @@ update_user_email_from_provider (ModestEasysetupWizardDialog *self)
domain_name = g_strdup (MODEST_EXAMPLE_EMAIL_ADDRESS);
if (priv->entry_user_email)
- gtk_entry_set_text (GTK_ENTRY (priv->entry_user_email), domain_name);
+ hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), domain_name);
g_free (domain_name);
@@ -380,12 +423,14 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
/* Create a size group to be used by all captions.
* Note that HildonCaption does not create a default size group if we do not specify one.
* We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
- GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ GtkSizeGroup* title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ GtkSizeGroup* value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* The country widgets: */
priv->account_country_picker = GTK_WIDGET (modest_country_picker_new (MODEST_EDITABLE_SIZE,
- MODEST_EDITABLE_ARRANGEMENT));
- hildon_button_set_title (HILDON_BUTTON (priv->account_country_picker), _("mcen_fi_country"));
+ HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
+ modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup,
+ _("mcen_fi_country"), priv->account_country_picker);
g_signal_connect (G_OBJECT (priv->account_country_picker), "value-changed",
G_CALLBACK (on_picker_button_value_changed), self);
gtk_box_pack_start (GTK_BOX (box), priv->account_country_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -397,10 +442,12 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
/* The service provider widgets: */
priv->account_serviceprovider_picker = GTK_WIDGET (modest_provider_picker_new (MODEST_EDITABLE_SIZE,
- MODEST_EDITABLE_ARRANGEMENT));
- hildon_button_set_title (HILDON_BUTTON (priv->account_serviceprovider_picker), _("mcen_fi_serviceprovider"));
+ HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
+ modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup,
+ _("mcen_fi_serviceprovider"),
+ priv->account_serviceprovider_picker);
g_signal_connect (G_OBJECT (priv->account_serviceprovider_picker), "value-changed",
- G_CALLBACK (on_picker_button_value_changed), self);
+ G_CALLBACK (on_serviceprovider_picker_button_value_changed), self);
gtk_box_pack_start (GTK_BOX (box), priv->account_serviceprovider_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (priv->account_serviceprovider_picker);
@@ -420,11 +467,11 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
g_free (default_account_name_start);
default_account_name_start = NULL;
- gtk_entry_set_text( GTK_ENTRY (priv->entry_account_title), default_account_name);
+ hildon_entry_set_text (HILDON_ENTRY (priv->entry_account_title), default_account_name);
g_free (default_account_name);
default_account_name = NULL;
- caption = create_captioned (self, sizegroup, _("mcen_fi_account_title"),
+ caption = create_captioned (self, title_sizegroup, value_sizegroup, _("mcen_fi_account_title"), FALSE,
priv->entry_account_title);
gtk_widget_show (priv->entry_account_title);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -458,6 +505,9 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
on_entry_max, self);
gtk_widget_show (GTK_WIDGET (box));
+
+ g_object_unref (title_sizegroup);
+ g_object_unref (value_sizegroup);
return GTK_WIDGET (box);
}
@@ -465,7 +515,8 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
static GtkWidget*
create_page_user_details (ModestEasysetupWizardDialog *self)
{
- GtkSizeGroup* sizegroup;
+ GtkSizeGroup* title_sizegroup;
+ GtkSizeGroup* value_sizegroup;
GtkWidget *box;
ModestEasysetupWizardDialogPrivate *priv;
@@ -475,7 +526,8 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
* Note that HildonCaption does not create a default size group if we do not specify one.
* We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
- sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* The name widgets: (use auto cap) */
priv->entry_user_name = GTK_WIDGET (modest_validating_entry_new ());
@@ -487,8 +539,8 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
gtk_entry_set_max_length (GTK_ENTRY (priv->entry_user_name), 64);
modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_user_name),
on_entry_max, self);
- GtkWidget *caption = create_captioned (self, sizegroup,
- _("mcen_li_emailsetup_name"), priv->entry_user_name);
+ GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup,
+ _("mcen_li_emailsetup_name"), FALSE, priv->entry_user_name);
g_signal_connect(G_OBJECT(priv->entry_user_name), "changed",
G_CALLBACK(on_easysetup_changed), self);
gtk_widget_show (priv->entry_user_name);
@@ -511,7 +563,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_username),
HILDON_GTK_INPUT_MODE_FULL);
- caption = create_captioned (self, sizegroup, _("mail_fi_username"),
+ caption = create_captioned (self, title_sizegroup, value_sizegroup, _("mail_fi_username"), FALSE,
priv->entry_user_username);
gtk_widget_show (priv->entry_user_username);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -521,8 +573,6 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
/* Prevent the use of some characters in the username,
* as required by our UI specification: */
- modest_validating_entry_set_unallowed_characters_whitespace (
- MODEST_VALIDATING_ENTRY (priv->entry_user_username));
modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(priv->entry_user_username),
modest_utils_on_entry_invalid_character, self);
@@ -533,14 +583,14 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
on_entry_max, self);
/* The password widgets: */
- priv->entry_user_password = gtk_entry_new ();
+ priv->entry_user_password = hildon_entry_new (MODEST_EDITABLE_SIZE);
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_password),
HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
gtk_entry_set_visibility (GTK_ENTRY (priv->entry_user_password), FALSE);
/* gtk_entry_set_invisible_char (GTK_ENTRY (priv->entry_user_password), '*'); */
- caption = create_captioned (self, sizegroup,
- _("mail_fi_password"), priv->entry_user_password);
+ caption = create_captioned (self, title_sizegroup, value_sizegroup,
+ _("mail_fi_password"), FALSE, priv->entry_user_password);
g_signal_connect(G_OBJECT(priv->entry_user_password), "changed",
G_CALLBACK(on_easysetup_changed), self);
gtk_widget_show (priv->entry_user_password);
@@ -551,8 +601,8 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
priv->entry_user_email = GTK_WIDGET (modest_validating_entry_new ());
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
- caption = create_captioned (self, sizegroup,
- _("mcen_li_emailsetup_email_address"), priv->entry_user_email);
+ caption = create_captioned (self, title_sizegroup, value_sizegroup,
+ _("mcen_li_emailsetup_email_address"), FALSE, priv->entry_user_email);
update_user_email_from_provider (self);
gtk_widget_show (priv->entry_user_email);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -568,33 +618,33 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
gtk_widget_show (GTK_WIDGET (box));
-
+ g_object_unref (title_sizegroup);
+ g_object_unref (value_sizegroup);
+
return GTK_WIDGET (box);
}
-static GtkWidget*
+static GtkWidget*
create_page_complete_easysetup (ModestEasysetupWizardDialog *self)
{
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
-
+
GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- /* The documentation for gtk_label_set_line_wrap() says that we must
- * call gtk_widget_set_size_request() with a hard-coded width,
- * though I wonder why gtk_label_set_max_width_chars() isn't enough. */
+
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
-
+
label = gtk_label_new (_("mcen_ia_easysetup_complete"));
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
-
+
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
-
+
gtk_widget_show (GTK_WIDGET (box));
return GTK_WIDGET (box);
}
@@ -611,19 +661,25 @@ update_incoming_server_title (ModestEasysetupWizardDialog *self)
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
protocol_registry = modest_runtime_get_protocol_registry ();
-
+
protocol_type = modest_servertype_picker_get_active_servertype (
MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker));
/* This could happen when the combo box has still no active iter */
if (protocol_type != MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) {
gchar* incomingserver_title;
- const gchar *protocol_display_name;
+ const gchar *protocol_display_name;
+ ModestProtocol *protocol;
+
+ protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry,
+ protocol_type);
+ protocol_display_name = modest_protocol_get_display_name (protocol);
+
+ incomingserver_title = g_strconcat (_("mcen_li_emailsetup_servertype"), "\n(",
+ protocol_display_name, ")", NULL);
+
+ modest_maemo_utils_captioned_set_label (priv->caption_incoming, incomingserver_title, TRUE);
- protocol_display_name = modest_protocol_get_display_name (modest_protocol_registry_get_protocol_by_type (protocol_registry, protocol_type));
-
- incomingserver_title = g_strdup_printf(_("mcen_li_emailsetup_servertype"), protocol_display_name);
- g_object_set (G_OBJECT (priv->caption_incoming), "label", incomingserver_title, NULL);
g_free(incomingserver_title);
}
}
@@ -687,19 +743,16 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self)
ModestProtocolRegistry *protocol_registry;
ModestEasysetupWizardDialogPrivate* priv;
GtkWidget *box;
- GtkWidget *scrolled_window;
+ GtkWidget *pannable;
GtkWidget *label;
- GtkSizeGroup *sizegroup;
+ GtkSizeGroup *title_sizegroup;
+ GtkSizeGroup *value_sizegroup;
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
protocol_registry = modest_runtime_get_protocol_registry ();
box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
- scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_NEVER,
- GTK_POLICY_AUTOMATIC);
+ pannable = hildon_pannable_area_new ();
/* Show note that account type cannot be changed in future: */
label = gtk_label_new (_("mcen_ia_emailsetup_account_type"));
@@ -711,11 +764,12 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self)
/* Create a size group to be used by all captions.
* Note that HildonCaption does not create a default size group if we do not specify one.
* We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
- sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* The incoming server widgets: */
priv->incoming_servertype_picker = GTK_WIDGET (modest_servertype_picker_new (MODEST_EDITABLE_SIZE,
- MODEST_EDITABLE_ARRANGEMENT,
+ HILDON_BUTTON_ARRANGEMENT_HORIZONTAL,
TRUE));
hildon_button_set_title (HILDON_BUTTON (priv->incoming_servertype_picker), _("mcen_li_emailsetup_type"));
g_signal_connect (G_OBJECT (priv->incoming_servertype_picker), "value-changed",
@@ -723,7 +777,7 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self)
gtk_box_pack_start (GTK_BOX (box), priv->incoming_servertype_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (priv->incoming_servertype_picker);
- priv->entry_incomingserver = gtk_entry_new ();
+ 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);
@@ -731,10 +785,9 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self)
/* 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) */
- priv->caption_incoming = create_captioned (self, sizegroup,
- "Incoming Server",
- priv->entry_incomingserver);
+ priv->caption_incoming = create_captioned (self, title_sizegroup, value_sizegroup,
+ "This will be removed",
+ FALSE, priv->entry_incomingserver);
update_incoming_server_title (self);
gtk_widget_show (priv->entry_incomingserver);
gtk_box_pack_start (GTK_BOX (box), priv->caption_incoming, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -754,44 +807,48 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self)
protocols with security */
priv->incoming_security =
modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_INCOMING,
- FALSE, sizegroup);
+ FALSE, title_sizegroup, value_sizegroup);
gtk_box_pack_start (GTK_BOX (box), priv->incoming_security,
FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_widget_show_all (priv->incoming_security);
/* Set default selection */
modest_servertype_picker_set_active_servertype (
MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker),
MODEST_PROTOCOLS_STORE_POP);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), box);
+ hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), box);
gtk_container_set_focus_vadjustment (GTK_CONTAINER (box),
- gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
+ hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (pannable)));
gtk_widget_show (GTK_WIDGET (box));
- gtk_widget_show (scrolled_window);
+ gtk_widget_show (pannable);
- return GTK_WIDGET (scrolled_window);
+ g_object_unref (title_sizegroup);
+ g_object_unref (value_sizegroup);
+
+ return GTK_WIDGET (pannable);
}
static void
-on_toggle_button_changed (GtkToggleButton *togglebutton, gpointer user_data)
+on_check_button_changed (HildonCheckButton *button, gpointer user_data)
{
GtkWidget *widget = GTK_WIDGET (user_data);
- /* Enable the widget only if the toggle button is active: */
- const gboolean enable = gtk_toggle_button_get_active (togglebutton);
+ /* Enable the widget only if the check button is active: */
+ const gboolean enable = hildon_check_button_get_active (button);
gtk_widget_set_sensitive (widget, enable);
}
-/* Make the sensitivity of a widget depend on a toggle button.
+/* Make the sensitivity of a widget depend on a check button.
*/
static void
-enable_widget_for_togglebutton (GtkWidget *widget, GtkToggleButton* button)
+enable_widget_for_checkbutton (GtkWidget *widget, HildonCheckButton* button)
{
g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (on_toggle_button_changed), widget);
+ G_CALLBACK (on_check_button_changed), widget);
/* Set the starting sensitivity: */
- on_toggle_button_changed (button, widget);
+ on_check_button_changed (button, widget);
}
static void
@@ -826,22 +883,29 @@ static GtkWidget*
create_page_custom_outgoing (ModestEasysetupWizardDialog *self)
{
ModestEasysetupWizardDialogPrivate *priv;
+ gchar *smtp_caption_label;
+ GtkWidget *pannable;
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
+
+ pannable = hildon_pannable_area_new ();
/* Create a size group to be used by all captions.
* Note that HildonCaption does not create a default size group if we do not specify one.
* We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
- GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ GtkSizeGroup *title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ GtkSizeGroup *value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* The outgoing server widgets: */
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
- priv->entry_outgoingserver = gtk_entry_new ();
+ 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);
- GtkWidget *caption = create_captioned (self, sizegroup,
- _("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver);
+ smtp_caption_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "\n(SMTP)", NULL);
+ GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup,
+ smtp_caption_label, TRUE, priv->entry_outgoingserver);
+ g_free (smtp_caption_label);
gtk_widget_show (priv->entry_outgoingserver);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
@@ -851,51 +915,59 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self)
protocols with security */
priv->outgoing_security =
modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_OUTGOING,
- FALSE, sizegroup);
+ FALSE, title_sizegroup, value_sizegroup);
gtk_box_pack_start (GTK_BOX (box), priv->outgoing_security,
FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (priv->outgoing_security);
-
+
GtkWidget *separator = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (separator);
-
+
/* connection-specific checkbox: */
- priv->checkbox_outgoing_smtp_specific = gtk_check_button_new ();
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->checkbox_outgoing_smtp_specific),
- FALSE);
+ priv->checkbox_outgoing_smtp_specific = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
+ hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific),
+ FALSE);
+ gtk_button_set_label (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific),
+ _("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);
- caption = modest_maemo_utils_create_captioned (sizegroup, _("mcen_fi_advsetup_connection_smtp"),
- priv->checkbox_outgoing_smtp_specific);
gtk_widget_show (priv->checkbox_outgoing_smtp_specific);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (caption);
-
+ gtk_box_pack_start (GTK_BOX (box), priv->checkbox_outgoing_smtp_specific,
+ FALSE, FALSE, MODEST_MARGIN_HALF);
+
/* Connection-specific SMTP-Severs Edit button: */
- priv->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit"));
- caption = modest_maemo_utils_create_captioned (sizegroup, _("mcen_fi_advsetup_optional_smtp"),
- priv->button_outgoing_smtp_servers);
- hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE);
+ priv->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_advsetup_optional_smtp"));
+ hildon_gtk_widget_set_theme_size (priv->button_outgoing_smtp_servers,
+ HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
gtk_widget_show (priv->button_outgoing_smtp_servers);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (caption);
-
+ gtk_box_pack_start (GTK_BOX (box), priv->button_outgoing_smtp_servers,
+ FALSE, FALSE, MODEST_MARGIN_HALF);
+
/* Only enable the button when the checkbox is checked: */
- enable_widget_for_togglebutton (priv->button_outgoing_smtp_servers,
- GTK_TOGGLE_BUTTON (priv->checkbox_outgoing_smtp_specific));
-
+ enable_widget_for_checkbutton (priv->button_outgoing_smtp_servers,
+ HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific));
+
g_signal_connect (G_OBJECT (priv->button_outgoing_smtp_servers), "clicked",
G_CALLBACK (on_button_outgoing_smtp_servers), self);
g_signal_connect (G_OBJECT (priv->entry_outgoingserver), "changed",
G_CALLBACK (on_entry_outgoing_servername_changed), self);
-
-
+
+
+ hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), box);
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (box),
+ hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (pannable)));
gtk_widget_show (GTK_WIDGET (box));
+ gtk_widget_show (pannable);
+
+ g_object_unref (title_sizegroup);
+ g_object_unref (value_sizegroup);
- return GTK_WIDGET (box);
+ return GTK_WIDGET (pannable);
}
static gboolean
@@ -933,32 +1005,29 @@ on_button_edit_advanced_settings (GtkButton *button, gpointer user_data)
static GtkWidget*
create_page_complete_custom (ModestEasysetupWizardDialog *self)
{
- GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
+ GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
- GtkWidget *button_edit = gtk_button_new_with_label (_("mcen_bd_edit"));
+ GtkWidget *button_edit = gtk_button_new_with_label (_("mcen_fi_advanced_settings"));
+ hildon_gtk_widget_set_theme_size (button_edit, HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_widget_set_size_request (label, LABELS_WIDTH, -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);
-
+
label = gtk_label_new (_("mcen_ia_customsetup_complete"));
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
gtk_widget_show (label);
-
- GtkWidget *caption = modest_maemo_utils_create_captioned (NULL, _("mcen_fi_advanced_settings"),
- button_edit);
- hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE);
+
gtk_widget_show (button_edit);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (caption);
-
+ gtk_box_pack_start (GTK_BOX (box), button_edit, FALSE, FALSE, MODEST_MARGIN_HALF);
+
g_signal_connect (G_OBJECT (button_edit), "clicked",
G_CALLBACK (on_button_edit_advanced_settings), self);
-
+
gtk_widget_show (GTK_WIDGET (box));
return GTK_WIDGET (box);
}
@@ -1148,6 +1217,7 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self)
/* Create the notebook to be used by the ModestWizardDialog base class:
* Each page of the notebook will be a page of the wizard: */
GtkNotebook *notebook = GTK_NOTEBOOK (gtk_notebook_new());
+ gtk_widget_set_size_request (GTK_WIDGET (notebook), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
/* Set the notebook used by the ModestWizardDialog base class: */
g_object_set (G_OBJECT(self), "wizard-notebook", notebook, NULL);
@@ -1225,9 +1295,6 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self)
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());
-
priv->settings = modest_account_settings_new ();
}
@@ -1348,6 +1415,9 @@ create_subsequent_pages (ModestEasysetupWizardDialog *self)
picker = MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker);
id_type = modest_provider_picker_get_active_id_type (picker);
g_object_get (self, "wizard-notebook", ¬ebook, NULL);
+ modest_wizard_dialog_set_response_override_handler (MODEST_WIZARD_DIALOG (self),
+ NULL);
+
if (id_type == MODEST_PROVIDER_PICKER_ID_OTHER) {
/* "Other..." was selected: */
@@ -1404,26 +1474,39 @@ create_subsequent_pages (ModestEasysetupWizardDialog *self)
proto_type != priv->last_plugin_protocol_selected) {
ModestPairList *tabs;
GSList *tmp;
+ gboolean first_page = TRUE;
+ ModestWizardDialogResponseOverrideFunc response_override;
/* Remember the last selected plugin protocol */
priv->last_plugin_protocol_selected = proto_type;
/* Get tabs */
tabs = modest_account_protocol_get_easysetupwizard_tabs (MODEST_ACCOUNT_PROTOCOL (protocol));
+ response_override = modest_account_protocol_get_wizard_response_override
+ (MODEST_ACCOUNT_PROTOCOL (protocol));
+ modest_wizard_dialog_set_response_override_handler (MODEST_WIZARD_DIALOG (self),
+ response_override);
tmp = (GSList *) tabs;
while (tmp) {
ModestPair *pair = (ModestPair *) tmp->data;
modest_easysetup_wizard_dialog_append_page (notebook,
GTK_WIDGET (pair->second),
(const gchar *) pair->first);
+ if (first_page) {
+ gtk_container_set_focus_child (GTK_CONTAINER (notebook),
+ GTK_WIDGET (pair->second));
+ first_page = FALSE;
+ }
/* Connect signals */
- priv->missing_data_signals =
- modest_signal_mgr_connect (priv->missing_data_signals,
- G_OBJECT (pair->second),
- "missing-mandatory-data",
- G_CALLBACK (on_missing_mandatory_data),
- self);
+ if (MODEST_IS_EASYSETUP_WIZARD_PAGE (pair->second)) {
+ priv->missing_data_signals =
+ modest_signal_mgr_connect (priv->missing_data_signals,
+ G_OBJECT (pair->second),
+ "missing-mandatory-data",
+ G_CALLBACK (on_missing_mandatory_data),
+ self);
+ }
g_free (pair->first);
tmp = g_slist_next (tmp);
@@ -1509,13 +1592,13 @@ set_default_custom_servernames (ModestEasysetupWizardDialog *self)
/* This could happen when the combo box has still no active iter */
if (protocol_type != MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) {
- const gchar* email_address = gtk_entry_get_text (GTK_ENTRY(priv->entry_user_email));
+ const gchar* email_address = hildon_entry_get_text (HILDON_ENTRY(priv->entry_user_email));
gchar* servername = util_get_default_servername_from_email_address (email_address,
protocol_type);
/* Do not set the INCOMING_CHANGED flag because of this edit */
g_signal_handlers_block_by_func (G_OBJECT (priv->entry_incomingserver), G_CALLBACK (on_entry_incoming_servername_changed), self);
- gtk_entry_set_text (GTK_ENTRY (priv->entry_incomingserver), servername);
+ hildon_entry_set_text (HILDON_ENTRY (priv->entry_incomingserver), servername);
g_signal_handlers_unblock_by_func (G_OBJECT (priv->entry_incomingserver), G_CALLBACK (on_entry_incoming_servername_changed), self);
g_free (servername);
@@ -1530,13 +1613,13 @@ set_default_custom_servernames (ModestEasysetupWizardDialog *self)
if (priv->entry_user_email
&& ((priv->server_changes & MODEST_EASYSETUP_WIZARD_DIALOG_OUTGOING_CHANGED) == 0)) {
- const gchar* email_address = gtk_entry_get_text (GTK_ENTRY(priv->entry_user_email));
+ const gchar* email_address = hildon_entry_get_text (HILDON_ENTRY(priv->entry_user_email));
gchar* servername = util_get_default_servername_from_email_address (email_address, MODEST_PROTOCOLS_TRANSPORT_SMTP);
/* Do not set the OUTGOING_CHANGED flag because of this edit */
g_signal_handlers_block_by_func (G_OBJECT (priv->entry_outgoingserver), G_CALLBACK (on_entry_outgoing_servername_changed), self);
- gtk_entry_set_text (GTK_ENTRY (priv->entry_outgoingserver), servername);
+ hildon_entry_set_text (HILDON_ENTRY (priv->entry_outgoingserver), servername);
g_signal_handlers_unblock_by_func (G_OBJECT (priv->entry_outgoingserver), G_CALLBACK (on_entry_outgoing_servername_changed), self);
g_free (servername);
@@ -1550,7 +1633,7 @@ get_entered_account_title (ModestEasysetupWizardDialog *self)
const gchar* account_title;
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
- account_title = gtk_entry_get_text (GTK_ENTRY (priv->entry_account_title));
+ account_title = hildon_entry_get_text (HILDON_ENTRY (priv->entry_account_title));
if (!account_title || (g_utf8_strlen (account_title, -1) == 0)) {
return NULL;
@@ -1612,7 +1695,7 @@ on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget *
} else if (current_page == priv->page_user_details) {
/* Check that the email address is valud: */
- const gchar* email_address = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_email));
+ const gchar* email_address = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_email));
if ((!email_address) || (g_utf8_strlen (email_address, -1) == 0))
return FALSE;
@@ -1634,9 +1717,9 @@ on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget *
set_default_custom_servernames (self);
/* Check if the server supports secure authentication */
-/* if (modest_security_options_view_auth_check (security_options)) */
-/* if (!check_has_supported_auth_methods (self)) */
-/* return FALSE; */
+ if (modest_security_options_view_auth_check (MODEST_SECURITY_OPTIONS_VIEW (priv->incoming_security)))
+ if (!check_has_supported_auth_methods (self))
+ return FALSE;
gtk_widget_show (priv->outgoing_security);
}
@@ -1668,7 +1751,7 @@ static gboolean entry_is_empty (GtkWidget *entry)
if (!entry)
return FALSE;
- const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry));
+ const gchar* text = hildon_entry_get_text (HILDON_ENTRY (entry));
if ((!text) || (g_utf8_strlen (text, -1) == 0))
return TRUE;
else {
@@ -1771,6 +1854,7 @@ modest_easysetup_wizard_dialog_class_init (ModestEasysetupWizardDialogClass *kla
ModestWizardDialogClass *base_klass = (ModestWizardDialogClass*)(klass);
base_klass->before_next = on_before_next;
base_klass->enable_buttons = on_enable_buttons;
+ base_klass->save_settings = on_save_settings;
}
/**
@@ -1805,7 +1889,7 @@ save_to_settings (ModestEasysetupWizardDialog *self)
/* Get details from the specified presets: */
id_type = modest_provider_picker_get_active_id_type (picker);
provider_id = modest_provider_picker_get_active_provider_id (picker);
-
+
/* Let the plugin save the settings. We do a return in order
to save an indentation level */
if (id_type == MODEST_PROVIDER_PICKER_ID_PLUGIN_PROTOCOL) {
@@ -1842,8 +1926,8 @@ save_to_settings (ModestEasysetupWizardDialog *self)
}
/* username and password (for both incoming and outgoing): */
- username = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_username));
- password = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_password));
+ username = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username));
+ password = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_password));
store_settings = modest_account_settings_get_store_settings (priv->settings);
transport_settings = modest_account_settings_get_transport_settings (priv->settings);
@@ -1860,20 +1944,20 @@ save_to_settings (ModestEasysetupWizardDialog *self)
ModestProtocolType store_provider_server_type;
gboolean store_provider_use_alternate_port;
/* Use presets: */
- store_hostname = modest_presets_get_server (priv->presets, provider_id,
+ store_hostname = modest_presets_get_server (priv->presets, provider_id,
TRUE /* store */);
-
+
store_provider_server_type = modest_presets_get_info_server_type (priv->presets,
- provider_id,
+ provider_id,
TRUE /* store */);
store_security = modest_presets_get_info_server_security (priv->presets,
- provider_id,
- TRUE /* store */);
+ provider_id,
+ TRUE /* store */);
store_auth_protocol = modest_presets_get_info_server_auth (priv->presets,
- provider_id,
- TRUE /* store */);
+ provider_id,
+ TRUE /* store */);
store_provider_use_alternate_port = modest_presets_get_info_server_use_alternate_port (priv->presets,
- provider_id,
+ provider_id,
TRUE /* store */);
/* We don't check for SMTP here as that is impossible for an incoming server. */
@@ -1902,7 +1986,7 @@ save_to_settings (ModestEasysetupWizardDialog *self)
modest_server_account_settings_set_port (store_settings, store_port);
} else {
/* Use custom pages because no preset was specified: */
- store_hostname = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->entry_incomingserver) ));
+ store_hostname = g_strdup (hildon_entry_get_text (HILDON_ENTRY (priv->entry_incomingserver) ));
store_protocol = modest_servertype_picker_get_active_servertype (
MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker));
@@ -1973,7 +2057,7 @@ save_to_settings (ModestEasysetupWizardDialog *self)
registry = modest_runtime_get_protocol_registry ();
/* Use custom pages because no preset was specified: */
- transport_hostname = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver) ));
+ transport_hostname = g_strdup (hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver) ));
store_proto = modest_protocol_registry_get_protocol_by_type (registry,
store_protocol);
@@ -1999,18 +2083,20 @@ save_to_settings (ModestEasysetupWizardDialog *self)
g_object_unref (transport_settings);
g_free (transport_hostname);
-
- fullname = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_name));
- email_address = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_email));
+
+ fullname = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_name));
+ email_address = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_email));
modest_account_settings_set_fullname (priv->settings, fullname);
modest_account_settings_set_email_address (priv->settings, email_address);
/* we don't set retrieve type to preserve advanced settings if
any. By default account settings are set to headers only */
-
+
/* Save the connection-specific SMTP server accounts. */
- modest_account_settings_set_use_connection_specific_smtp
- (priv->settings,
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->checkbox_outgoing_smtp_specific)));
+ if (priv->checkbox_outgoing_smtp_specific) {
+ modest_account_settings_set_use_connection_specific_smtp
+ (priv->settings,
+ hildon_check_button_get_active(HILDON_CHECK_BUTTON(priv->checkbox_outgoing_smtp_specific)));
+ }
display_name = get_entered_account_title (self);
modest_account_settings_set_display_name (priv->settings, display_name);
@@ -2018,3 +2104,82 @@ save_to_settings (ModestEasysetupWizardDialog *self)
g_free (provider_id);
}
+
+static void
+on_save_settings (ModestWizardDialog *dialog)
+{
+ ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (dialog);
+ save_to_settings (self);
+
+}
+
+
+static GList*
+check_for_supported_auth_methods (ModestEasysetupWizardDialog* self)
+{
+ GError *error = NULL;
+ ModestProtocolType protocol_type;
+ const gchar* hostname;
+ const gchar* username;
+ ModestProtocolType security_protocol_incoming_type;
+ ModestProtocolRegistry *registry;
+ int port_num;
+ GList *list_auth_methods;
+ ModestEasysetupWizardDialogPrivate *priv;
+
+ priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+ registry = modest_runtime_get_protocol_registry ();
+ protocol_type = modest_servertype_picker_get_active_servertype (
+ MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker));
+ hostname = gtk_entry_get_text(GTK_ENTRY(priv->entry_incomingserver));
+ username = gtk_entry_get_text(GTK_ENTRY(priv->entry_user_username));
+ security_protocol_incoming_type = modest_security_options_view_get_connection_protocol
+ (MODEST_SECURITY_OPTIONS_VIEW (priv->incoming_security));
+ port_num = get_port_from_protocol(protocol_type, FALSE);
+ list_auth_methods = modest_utils_get_supported_secure_authentication_methods (protocol_type, hostname, port_num,
+ username, GTK_WINDOW (self), &error);
+
+ if (list_auth_methods) {
+ /* TODO: Select the correct method */
+ GList* list = NULL;
+ GList* method;
+ for (method = list_auth_methods; method != NULL; method = g_list_next(method)) {
+ ModestProtocolType auth_protocol_type = (ModestProtocolType) (GPOINTER_TO_INT(method->data));
+ if (modest_protocol_registry_protocol_type_has_tag (registry, auth_protocol_type,
+ MODEST_PROTOCOL_REGISTRY_SECURE_PROTOCOLS)) {
+ list = g_list_append(list, GINT_TO_POINTER(auth_protocol_type));
+ }
+ }
+
+ g_list_free(list_auth_methods);
+
+ if (list)
+ return list;
+ }
+
+ if(error == NULL || error->domain != modest_utils_get_supported_secure_authentication_error_quark() ||
+ error->code != MODEST_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED)
+ {
+ modest_platform_information_banner (GTK_WIDGET(self), NULL,
+ _("mcen_ib_unableto_discover_auth_methods"));
+ }
+
+ if(error != NULL)
+ g_error_free(error);
+
+ return NULL;
+}
+
+static gboolean
+check_has_supported_auth_methods(ModestEasysetupWizardDialog* self)
+{
+ GList* methods = check_for_supported_auth_methods(self);
+ if (!methods)
+ {
+ return FALSE;
+ }
+
+ g_list_free(methods);
+ return TRUE;
+}
+