EMailConfigAssistant: Make revising auto-configuration easier.

After providing a name and email address on the Identity page, the user
clicks Forward and auto-configuration runs.  If successful, it jumps to
the Account Summary page showing a table of auto-configured settings.

If the user wants to go back and revise auto-configured settings, he
would click Go Back to return to the Identity Page, then click Forward
again to go to Receiving Email (since auto-coniguration only runs once).

But this is confusing.  It's not clear that clicking Forward from the
Identity Page will behave differently after auto-configuration has run.
Instead, clicking Go Back from the Summary Page after auto-configuration
should return to the Receiving Email page where IMAP/POP settings can be
modified.

This behavior combined with the GtkAssistant navigation sidebar should
hopefully make it less confusing.

(cherry picked from commit af1d412eed6cf20810c5b3fa49a3c31676dbbeb0)

1 files changed, 5 insertions, 0 deletions

diff --git a/mail/e-mail-config-assistant.c b/mail/e-mail-config-assistant.c
index 407d076f80..26d6c70104 100644
--- a/mail/e-mail-config-assistant.c
+++ b/mail/e-mail-config-assistant.c
@@ -254,6 +254,11 @@ mail_config_assistant_autoconfigure_cb (GObject *source_object,
 	email_address = e_mail_autoconfig_get_email_address (autoconfig);
 	e_source_set_display_name (priv->identity_source, email_address);
 
+	/* Go to the next page (Receiving Email) before skipping to the
+	 * Summary Page to get it into GtkAssistant visited page history.
+	 * We want the back button to return to Receiving Email. */
+	gtk_assistant_next_page (context->assistant);
+
 	/* XXX Can't find a better way to learn the page number of
 	 *     the summary page.  Oh my god this API is horrible. */
 	n_pages = gtk_assistant_get_n_pages (assistant);