From abd53549d2c27f4311186ae56962be092829355c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 10 Nov 2011 13:48:39 +0100 Subject: Bug #663748 - Unable to reconfigure GOA GMail account --- modules/online-accounts/e-online-accounts-google.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'modules/online-accounts/e-online-accounts-google.c') diff --git a/modules/online-accounts/e-online-accounts-google.c b/modules/online-accounts/e-online-accounts-google.c index 666c407511..424cec24bd 100644 --- a/modules/online-accounts/e-online-accounts-google.c +++ b/modules/online-accounts/e-online-accounts-google.c @@ -139,6 +139,15 @@ online_accounts_google_sync_mail (GoaObject *goa_object, const gchar *string; gboolean new_account = FALSE; + account_list = e_get_account_list (); + account = e_get_account_by_uid (evo_id); + + if (account) { + /* the account is already configured, + do not change user's changes */ + return; + } + /* XXX There's nothing particularly GMail-specific about this. * Maybe break this off into a more generic IMAP/SMTP sync * function and then apply any GMail-specific tweaks. */ @@ -146,9 +155,6 @@ online_accounts_google_sync_mail (GoaObject *goa_object, goa_mail = goa_object_get_mail (goa_object); goa_account = goa_object_get_account (goa_object); - account_list = e_get_account_list (); - account = e_get_account_by_uid (evo_id); - if (account == NULL) { account = g_object_new (E_TYPE_ACCOUNT, NULL); account->uid = g_strdup (evo_id); -- cgit v1.2.3 From d0e42d7101a571bd69215cd14894cfe7935700af Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 10 Nov 2011 17:34:19 +0100 Subject: Bug #659736 - GOA Google calendar prevents settings change --- modules/online-accounts/e-online-accounts-google.c | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/online-accounts/e-online-accounts-google.c') diff --git a/modules/online-accounts/e-online-accounts-google.c b/modules/online-accounts/e-online-accounts-google.c index 424cec24bd..07c8923609 100644 --- a/modules/online-accounts/e-online-accounts-google.c +++ b/modules/online-accounts/e-online-accounts-google.c @@ -314,6 +314,7 @@ online_accounts_google_sync_calendar (GoaObject *goa_object, uri_string = g_strdup_printf ( "caldav://%s@www.google.com/calendar/dav/%s/events", encoded, string); + e_source_set_relative_uri (source, uri_string); e_source_set_absolute_uri (source, uri_string); g_free (uri_string); g_free (encoded); -- cgit v1.2.3