[evolution/gnome-3-20] Bug 758878 - Asked repeatedly for a Google account password (with calendar)

[Milan Crha <mcrha src gnome org>]

commit a4243db8859bec8bb5ab15fd149ebc6d5b6c39be
Author: Milan Crha <mcrha redhat com>
Date:   Wed Apr 6 17:35:57 2016 +0200

    Bug 758878 - Asked repeatedly for a Google account password (with calendar)

 modules/mail-config/e-mail-config-google-summary.c |    6 +++++-
 modules/mail-config/e-mail-config-yahoo-summary.c  |    6 ++++++
 2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/modules/mail-config/e-mail-config-google-summary.c 
b/modules/mail-config/e-mail-config-google-summary.c
index cfae7f2..1887ca5 100644
--- a/modules/mail-config/e-mail-config-google-summary.c
+++ b/modules/mail-config/e-mail-config-google-summary.c
@@ -157,8 +157,12 @@ mail_config_google_summary_commit_changes_cb (EMailConfigSummaryPage *page,
        collection_extension = e_source_get_extension (source, extension_name);
        e_source_collection_set_identity (collection_extension, user);
 
+       /* Always create the Authentication extension, thus the collection source
+          can be used for the credentials prompt. */
+       auth_extension = e_source_get_extension (source, E_SOURCE_EXTENSION_AUTHENTICATION);
+       e_source_authentication_set_host (auth_extension, "");
+
        if (e_source_credentials_google_is_supported ()) {
-               auth_extension = e_source_get_extension (source, E_SOURCE_EXTENSION_AUTHENTICATION);
                e_source_authentication_set_user (auth_extension, user);
                e_source_authentication_set_method (auth_extension, "Google");
        }
diff --git a/modules/mail-config/e-mail-config-yahoo-summary.c 
b/modules/mail-config/e-mail-config-yahoo-summary.c
index 9d97604..10fceae 100644
--- a/modules/mail-config/e-mail-config-yahoo-summary.c
+++ b/modules/mail-config/e-mail-config-yahoo-summary.c
@@ -113,6 +113,7 @@ mail_config_yahoo_summary_commit_changes_cb (EMailConfigSummaryPage *page,
        ESource *source;
        ESourceCollection *collection_extension;
        ESourceMailIdentity *identity_extension;
+       ESourceAuthentication *auth_extension;
        GtkToggleButton *toggle_button;
        GList *head, *link;
        const gchar *address;
@@ -147,6 +148,11 @@ mail_config_yahoo_summary_commit_changes_cb (EMailConfigSummaryPage *page,
        collection_extension = e_source_get_extension (source, extension_name);
        e_source_collection_set_identity (collection_extension, address);
 
+       /* Always create the Authentication extension, thus the collection source
+          can be used for the credentials prompt. */
+       auth_extension = e_source_get_extension (source, E_SOURCE_EXTENSION_AUTHENTICATION);
+       e_source_authentication_set_host (auth_extension, "");
+
        /* All queued sources become children of the collection source. */
        parent_uid = e_source_get_uid (source);
        head = g_queue_peek_head_link (source_queue);