* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 37 insertions, 0 deletions

diff --git a/kresources/caldav/writer.cpp b/kresources/caldav/writer.cpp
index e939f3d9c..a466322eb 100644
--- a/kresources/caldav/writer.cpp
+++ b/kresources/caldav/writer.cpp
@@ -103,6 +103,34 @@ int CalDavWriter::runJob(runtime_info* RT) {
       }
     }
 
+    int journalsres = OK;
+
+    if ((OK == journalsres) && (tasksUrl() != "")) {
+      kdDebug() << "pushing added tasks objects";
+      journalsres = pushJournalsObjects(mJournalsAdded, caldav_add_object, OK, RT);
+      if (OK == journalsres) {
+#ifdef USE_CALDAV_TASKS_MODIFY
+          kdDebug() << "pushing changed objects";
+          journalsres = pushJournalsObjects(mJournalsChanged, caldav_tasks_modify_object, OK, RT);
+          if (OK == journalsres) {
+              kdDebug() << "pushing deleted objects";
+              journalsres = pushJournalsObjects(mJournalsDeleted, caldav_tasks_delete_object, OK, RT);
+          }
+#else // if USE_CALDAV_TASKS_MODIFY
+          kdDebug() << "pushing changed objects (delete)";
+          journalsres = pushJournalsObjects(mJournalsChanged, caldav_tasks_delete_object, OK, RT);
+          if (OK == journalsres) {
+              kdDebug() << "pushing changed objects (add)";
+              journalsres = pushJournalsObjects(mJournalsChanged, caldav_add_object, OK, RT);
+              if (OK == journalsres) {
+                  kdDebug() << "pushing deleted objects";
+                  journalsres = pushJournalsObjects(mJournalsDeleted, caldav_tasks_delete_object, OK, RT);
+              }
+          }
+#endif // if USE_CALDAV_TASKS_MODIFY
+      }
+    }
+
     if ((OK != res) || (OK != tasksres)) {
         clearObjects();
     }
@@ -122,4 +150,13 @@ void CalDavWriter::cleanTasksJob() {
     // Stub function as there is no reason to split the writing jobs like the reading jobs
 }
 
+int CalDavWriter::runJournalsJob(runtime_info* RT) {
+    // Stub function as there is no reason to split the writing jobs like the reading jobs
+    return OK;
+}
+
+void CalDavWriter::cleanJournalsJob() {
+    // Stub function as there is no reason to split the writing jobs like the reading jobs
+}
+
 // EOF ========================================================================