aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-12-31 23:41:54 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-12-31 23:41:54 +0800
commitf314742b795ea7749e4ec4747c55ff6e7e701fa6 (patch)
tree9eeddaed3055b700db740385a4b6f34b8eeb0d8e
parent800a5828e5bf36520d0d423612049a64c2e9f111 (diff)
downloadgsoc2013-evolution-f314742b795ea7749e4ec4747c55ff6e7e701fa6.tar.gz
gsoc2013-evolution-f314742b795ea7749e4ec4747c55ff6e7e701fa6.tar.zst
gsoc2013-evolution-f314742b795ea7749e4ec4747c55ff6e7e701fa6.zip
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...)
-rw-r--r--modules/book-config-google/evolution-book-config-google.c6
1 files changed, 2 insertions, 4 deletions
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);