From f314742b795ea7749e4ec4747c55ff6e7e701fa6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 31 Dec 2012 10:41:54 -0500 Subject: book-config-google: Populate [Authentication] group. Set the Host to "www.google.com" and Method to "ClientLogin". Don't need to worry about migrating existing Google Contacts sources, which had "plain/password" as the auth method. The Google EBookBackend only explicitly checks whether the auth method is "OAuth2", and assumes "ClientLogin" otherwise. (I suppose the registry service could tweak older key files, but meh...) --- modules/book-config-google/evolution-book-config-google.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'modules') diff --git a/modules/book-config-google/evolution-book-config-google.c b/modules/book-config-google/evolution-book-config-google.c index 709a6f3112..b15048dda8 100644 --- a/modules/book-config-google/evolution-book-config-google.c +++ b/modules/book-config-google/evolution-book-config-google.c @@ -97,10 +97,8 @@ book_config_google_commit_changes (ESourceConfigBackend *backend, extension_name = E_SOURCE_EXTENSION_AUTHENTICATION; extension = e_source_get_extension (scratch_source, extension_name); - /* The authentication method should match what the google backend - * returns for get_supported_auth_methods(), although in practice - * the value just needs to be something other than "none". */ - e_source_authentication_set_method (extension, "plain/password"); + e_source_authentication_set_host (extension, "www.google.com"); + e_source_authentication_set_method (extension, "ClientLogin"); user = e_source_authentication_get_user (extension); g_return_if_fail (user != NULL); -- cgit v1.2.3