aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-11-02 21:41:55 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-11-02 21:41:55 +0800
commit0849af1df6b923a534b3982406d690bb344355ab (patch)
treea85e9a409d0da412f7e84b218a0c46f6ad5141df /plugins
parent5182ae7cef949001e6aa8b36f1c8fa1694570f98 (diff)
parentbcf8dbb96f31e1b7fcca3a179f64885ca04ff565 (diff)
downloadgsoc2013-evolution-0849af1df6b923a534b3982406d690bb344355ab.tar.gz
gsoc2013-evolution-0849af1df6b923a534b3982406d690bb344355ab.tar.zst
gsoc2013-evolution-0849af1df6b923a534b3982406d690bb344355ab.zip
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'plugins')
-rw-r--r--plugins/google-account-setup/google-source.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index a9785ad844..405d52155e 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -467,6 +467,7 @@ retrieve_list_clicked (GtkButton *button,
authorizer = gdata_client_login_authorizer_new ("evolution-client-0.1.0", GDATA_TYPE_CALENDAR_SERVICE);
service = gdata_calendar_service_new (GDATA_AUTHORIZER (authorizer));
+ update_proxy_settings (GDATA_SERVICE (service), URL_GET_SUBSCRIBED_CALENDARS);
if (!gdata_client_login_authorizer_authenticate (authorizer, user, password, NULL, &error)) {
/* Error! */
claim_error (parent, error->message);
@@ -481,7 +482,6 @@ retrieve_list_clicked (GtkButton *button,
memset (password, 0, strlen (password));
g_free (password);
- update_proxy_settings (GDATA_SERVICE (service), URL_GET_SUBSCRIBED_CALENDARS);
feed = gdata_calendar_service_query_all_calendars (service, NULL, NULL, NULL, NULL, &error);
if (feed) {