aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-10-13 16:31:29 +0800
committerMilan Crha <mcrha@redhat.com>2011-10-13 16:31:29 +0800
commit08e036104f9c8c9e9e8377cced4b55b0090f56d7 (patch)
tree3547853a20f6000a27dbfab8a2725487b647cd4e
parente92b9ed8d85b555eaac65cb80eed8a7e0ddb5ddc (diff)
downloadgsoc2013-evolution-08e036104f9c8c9e9e8377cced4b55b0090f56d7.tar.gz
gsoc2013-evolution-08e036104f9c8c9e9e8377cced4b55b0090f56d7.tar.zst
gsoc2013-evolution-08e036104f9c8c9e9e8377cced4b55b0090f56d7.zip
Bug #660721 - Online Account services not always activating
-rw-r--r--mail/e-mail-store.c4
-rw-r--r--modules/online-accounts/e-online-accounts-google.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index ea44e4238b..793c2e4978 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -345,7 +345,7 @@ handle_transport:
camel_url_free (url);
}
- if (!skip && (provider->flags & CAMEL_PROVIDER_IS_STORAGE))
+ if (!skip && (provider->flags & CAMEL_PROVIDER_IS_STORAGE) != 0 && store_table != NULL)
e_mail_store_add (session, CAMEL_STORE (service));
return CAMEL_STORE (service);
@@ -409,7 +409,7 @@ e_mail_store_remove_by_account (EMailSession *session,
if (provider == NULL)
return;
- if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
+ if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE) || store_table == NULL)
return;
service = camel_session_get_service (
diff --git a/modules/online-accounts/e-online-accounts-google.c b/modules/online-accounts/e-online-accounts-google.c
index 04d7f9f39a..666c407511 100644
--- a/modules/online-accounts/e-online-accounts-google.c
+++ b/modules/online-accounts/e-online-accounts-google.c
@@ -249,6 +249,8 @@ online_accounts_google_sync_mail (GoaObject *goa_object,
g_object_unref (account);
}
+ e_account_list_save (account_list);
+
g_object_unref (goa_account);
g_object_unref (goa_mail);
}
@@ -327,6 +329,7 @@ online_accounts_google_sync_calendar (GoaObject *goa_object,
}
g_object_unref (source_group);
+ g_object_unref (source_list);
g_object_unref (goa_account);
}
@@ -387,6 +390,7 @@ online_accounts_google_sync_contacts (GoaObject *goa_object,
}
g_object_unref (source_group);
+ g_object_unref (source_list);
g_object_unref (goa_account);
}