* 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, 31 insertions, 0 deletions

diff --git a/kresources/caldav/job.cpp b/kresources/caldav/job.cpp
index 6edfbbfe8..8e49041f6 100644
--- a/kresources/caldav/job.cpp
+++ b/kresources/caldav/job.cpp
@@ -68,6 +68,12 @@ void CalDavJob::setTasksErrorString(const TQString& err, const long number) {
     mTasksErrorNumber = number;
 }
 
+void CalDavJob::setJournalsErrorString(const TQString& err, const long number) {
+    mJournalsError = true;
+    mJournalsErrorString = err;
+    mJournalsErrorNumber = number;
+}
+
 void CalDavJob::processError(const caldav_error* err) {
     TQString error_string;
 
@@ -100,6 +106,22 @@ void CalDavJob::processTasksError(const caldav_error* err) {
     setTasksErrorString(error_string, code);
 }
 
+void CalDavJob::processJournalsError(const caldav_error* err) {
+    TQString error_string;
+
+    long code = err->code;
+
+    if (-401 == code) { // unauthorized
+        error_string = i18n("Unauthorized. Username or password incorrect.");
+    } else if (-599 <= code && code <= -300) {
+        error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code);
+    } else {
+        error_string = err->str;
+    }
+
+    setJournalsErrorString(error_string, code);
+}
+
 
 void CalDavJob::run() {
     log("cleaning job");
@@ -107,6 +129,7 @@ void CalDavJob::run() {
 
     int res = OK;
     int tasksres = OK;
+    int journalsres = OK;
 
     runtime_info* caldav_runtime = caldav_get_runtime_info();
 
@@ -131,6 +154,14 @@ void CalDavJob::run() {
         processTasksError(caldav_runtime->error);
     }
 
+    log("running journals job");
+    journalsres = runJournalsJob(caldav_runtime);
+
+    if (OK != journalsres) {
+        log("journals job failed");
+        processJournalsError(caldav_runtime->error);
+    }
+
     caldav_free_runtime_info(&caldav_runtime);
 
     // Signal done