* Fixed crash when modifying single instance of recurring meeeting in agenda view

* Allow CalDAV tasks read/write to continue even if events read/write failed
* Documentation cleanup


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

1 files changed, 10 insertions, 5 deletions

diff --git a/kresources/caldav/reader.cpp b/kresources/caldav/reader.cpp
index 9e167e7d..02358ba0 100644
--- a/kresources/caldav/reader.cpp
+++ b/kresources/caldav/reader.cpp
@@ -63,20 +63,22 @@ int CalDavReader::runJob(runtime_info* RT) {
 
     caldav_free_response(&result);
 
-    if ((OK == res) && (tasksUrl() != "")) {
+    CALDAV_RESPONSE tasksres = OK;
+
+    if ((OK == tasksres) && (tasksUrl() != "")) {
       kdDebug() << "reader::run, url: " << tasksUrl();
 
       result = caldav_get_response();
 
       if (mGetAll) {
           kdDebug() << "getting all objects";
-          res = caldav_tasks_getall_object(result, std::string(tasksUrl().ascii()).c_str(), RT);
+          tasksres = caldav_tasks_getall_object(result, std::string(tasksUrl().ascii()).c_str(), RT);
       } else {
           kdDebug() << "getting object from the specified time range";
-          res = caldav_tasks_get_object(result, mTimeStart.toTime_t(), mTimeEnd.toTime_t(), std::string(tasksUrl().ascii()).c_str(), RT);
+          tasksres = caldav_tasks_get_object(result, mTimeStart.toTime_t(), mTimeEnd.toTime_t(), std::string(tasksUrl().ascii()).c_str(), RT);
       }
 
-      if (OK == res) {
+      if (OK == tasksres) {
           kdDebug() << "success";
           if (result->msg) {
               mTasksData = result->msg;
@@ -90,7 +92,10 @@ int CalDavReader::runJob(runtime_info* RT) {
       caldav_free_response(&result);
     }
 
-    return res;
+    if (tasksres == OK)
+      return res;
+    else
+      return tasksres;
 }
 
 // EOF ========================================================================