[evolution-ews/gnome-3-16] Bug 709924 - Cannot turn off offline GAL once selected
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews/gnome-3-16] Bug 709924 - Cannot turn off offline GAL once selected
- Date: Thu, 9 Apr 2015 14:36:09 +0000 (UTC)
commit a777f3745a82aa6493ee07ce829395e41ed5c83a
Author: Milan Crha <mcrha redhat com>
Date: Thu Apr 9 16:33:26 2015 +0200
Bug 709924 - Cannot turn off offline GAL once selected
src/addressbook/e-book-backend-ews.c | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index 4af3389..b6dd417 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -3158,7 +3158,7 @@ delta_thread (gpointer data)
if (!priv->is_gal)
succeeded = ebews_start_sync (ebews);
- else if (priv->summary)
+ else if (priv->summary && priv->marked_for_offline)
succeeded = ebews_start_gal_sync (ebews);
g_mutex_lock (&priv->dlock->mutex);
@@ -3487,17 +3487,12 @@ book_backend_ews_initable_init (GInitable *initable,
priv->marked_for_offline = FALSE;
priv->is_writable = FALSE;
- if (!priv->is_gal) {
- extension_name = E_SOURCE_EXTENSION_OFFLINE;
- extension = e_source_get_extension (source, extension_name);
+ extension_name = E_SOURCE_EXTENSION_OFFLINE;
+ extension = e_source_get_extension (source, extension_name);
- priv->marked_for_offline =
- e_source_offline_get_stay_synchronized (
- E_SOURCE_OFFLINE (extension));
+ priv->marked_for_offline = e_source_offline_get_stay_synchronized (E_SOURCE_OFFLINE (extension));
- /* If folder_id is present it means the GAL is marked for
- * offline usage, we do not check for offline_sync property */
- } else if (priv->folder_id != NULL) {
+ if (priv->is_gal) {
priv->folder_name = g_strdup (display_name);
priv->oab_url = camel_ews_settings_dup_oaburl (settings);
@@ -3506,7 +3501,7 @@ book_backend_ews_initable_init (GInitable *initable,
cache_dir, "attachments", NULL);
g_mkdir_with_parents (priv->attachment_dir, 0777);
- priv->marked_for_offline = TRUE;
+ priv->marked_for_offline = camel_ews_settings_get_oab_offline (settings);
}
return TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]