Major KAddressbook carddav fixes and improvements (should now work with Zimbra once Zimbra fixes a standards compliance issue with contact creation mimetypes)

Fixed handling of close events and save interaction with Kontact and Korganizer

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

1 files changed, 5 insertions, 7 deletions

diff --git a/kresources/carddav/reader.cpp b/kresources/carddav/reader.cpp
index 57375e9f9..d71d5236a 100644
--- a/kresources/carddav/reader.cpp
+++ b/kresources/carddav/reader.cpp
@@ -38,13 +38,11 @@ int CardDavReader::runJob(runtime_info* RT) {
     response* result = carddav_get_response();
     CARDDAV_RESPONSE res = OK;
 
-    if (mGetAll) {
-        kdDebug() << "getting all objects";
-    	res = carddav_getall_object(result, std::string(url().ascii()).c_str(), RT);
-    } else {
-        kdDebug() << "getting object from the specified time range";
-        res = carddav_get_object(result, mTimeStart.toTime_t(), mTimeEnd.toTime_t(), std::string(url().ascii()).c_str(), RT);
-    }
+    kdDebug() << "getting all objects";
+    if (getUseURI() == false)
+        res = carddav_getall_object(result, std::string(url().ascii()).c_str(), RT);
+    else
+        res = carddav_getall_object_by_uri(result, std::string(url().ascii()).c_str(), RT);
 
     if (OK == res) {
         kdDebug() << "success";