[evolution/gnome-3-2] Bug #662589 - 'Retrieve List' for new Google calendar does not use proxy



commit 5d15941426756fd85eb4ac47568c48852f9461f9
Author: Milan Crha <mcrha redhat com>
Date:   Wed Nov 2 09:09:35 2011 +0100

    Bug #662589 - 'Retrieve List' for new Google calendar does not use proxy

 plugins/google-account-setup/google-source.c |    3 ++-
 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 e8d3f5a..962bbfc 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) {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]