aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-11-02 16:09:35 +0800
committerMilan Crha <mcrha@redhat.com>2011-11-02 16:09:35 +0800
commit5d15941426756fd85eb4ac47568c48852f9461f9 (patch)
tree11b880293e56ce6cded190a4faf2de5b4467158b
parent1c4c79f74d628c0c171d0f2e05c137c13a65fb45 (diff)
downloadgsoc2013-evolution-5d15941426756fd85eb4ac47568c48852f9461f9.tar
gsoc2013-evolution-5d15941426756fd85eb4ac47568c48852f9461f9.tar.gz
gsoc2013-evolution-5d15941426756fd85eb4ac47568c48852f9461f9.tar.bz2
gsoc2013-evolution-5d15941426756fd85eb4ac47568c48852f9461f9.tar.lz
gsoc2013-evolution-5d15941426756fd85eb4ac47568c48852f9461f9.tar.xz
gsoc2013-evolution-5d15941426756fd85eb4ac47568c48852f9461f9.tar.zst
gsoc2013-evolution-5d15941426756fd85eb4ac47568c48852f9461f9.zip
Bug #662589 - 'Retrieve List' for new Google calendar does not use proxy
-rw-r--r--plugins/google-account-setup/google-source.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index e8d3f5a410..962bbfc6de 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -470,9 +470,11 @@ retrieve_list_clicked (GtkButton *button,
#ifdef HAVE_LIBGDATA_0_9
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)) {
#else
service = gdata_calendar_service_new ("evolution-client-0.1.0");
+ update_proxy_settings (GDATA_SERVICE (service), URL_GET_SUBSCRIBED_CALENDARS);
if (!gdata_service_authenticate (GDATA_SERVICE (service), user, password, NULL, &error)) {
#endif
/* Error! */
@@ -488,7 +490,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) {