Imported Upstream version 1.1.0.99.1

[platform/upstream/syncevolution.git] / src / backends / kcalextended / KCalExtendedSource.cpp

diff --git a/src/backends/kcalextended/KCalExtendedSource.cpp b/src/backends/kcalextended/KCalExtendedSource.cpp
index d26f64a..6d3d586 100644 (file)
--- a/src/backends/kcalextended/KCalExtendedSource.cpp
+++ b/src/backends/kcalextended/KCalExtendedSource.cpp
@@ -218,9 +218,6 @@ void KCalExtendedSource::open()
         if (!m_data->m_storage->open()) {
             throwError("failed to open storage");
         }
-        if (!m_data->m_storage->load()) {
-            throwError("failed to load calendar");
-        }
         mKCal::Notebook::Ptr defaultNotebook = m_data->m_storage->defaultNotebook();
         if (!defaultNotebook) {
             throwError("no default Notebook");
@@ -260,6 +257,13 @@ void KCalExtendedSource::open()
         }
         m_data->m_notebookUID = notebook->uid();
     }
+
+    // we are not currently using partial loading because there were
+    // issues with it (BMC #6061); the load() calls elsewhere in this
+    // file are commented out
+    if (!m_data->m_storage->load()) {
+        throwError("failed to load calendar");
+    }
 }
 
 bool KCalExtendedSource::isEmpty()