TDE
/
tdepim
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim
0
0
Fork 0
Code Issues Releases Wiki Activity

Fixed 404 when deleting multiple contacts

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1168498 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 78933401a0
commit a3e46fcf74
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File

26
kresources/carddav/writer.cpp
Unescape View File

@ -58,10 +58,15 @@ int CardDavWriter::runJob(runtime_info* RT) {
res = pushObjects(mChanged, carddav_modify_object_by_uri, OK, RT); res = pushObjects(mChanged, carddav_modify_object_by_uri, OK, RT);
if (OK == res) { if (OK == res) {
kdDebug() << "pushing deleted objects"; kdDebug() << "pushing deleted objects";
if (getUseURI() == false) while (mDeleted.contains("BEGIN:VCARD", TRUE) > 0) {
res = pushObjects(mDeleted, carddav_delete_object, OK, RT); int endLocation = mDeleted.find("END:VCARD", 0, TRUE);
else TQString deletedCurSeq = mDeleted.mid(0, endLocation+9);
res = pushObjects(mDeleted, carddav_delete_object_by_uri, OK, RT); mDeleted = mDeleted.remove(0, endLocation+9);
if (getUseURI() == false)
res = pushObjects(deletedCurSeq, carddav_delete_object, OK, RT);
else
res = pushObjects(deletedCurSeq, carddav_delete_object_by_uri, OK, RT);
}
} }
#else // if USE_CARDDAV_MODIFY #else // if USE_CARDDAV_MODIFY
kdDebug() << "pushing changed objects (delete)"; kdDebug() << "pushing changed objects (delete)";
@ -77,10 +82,15 @@ int CardDavWriter::runJob(runtime_info* RT) {
res = pushObjects(mChanged, carddav_add_object, OK, RT); res = pushObjects(mChanged, carddav_add_object, OK, RT);
if (OK == res) { if (OK == res) {
kdDebug() << "pushing deleted objects"; kdDebug() << "pushing deleted objects";
if (getUseURI() == false) while (mDeleted.contains("BEGIN:VCARD", TRUE) > 0) {
res = pushObjects(mDeleted, carddav_delete_object, OK, RT); int endLocation = mDeleted.find("END:VCARD", 0, TRUE);
else TQString deletedCurSeq = mDeleted.mid(0, endLocation+9);
res = pushObjects(mDeleted, carddav_delete_object_by_uri, OK, RT); mDeleted = mDeleted.remove(0, endLocation+9);
if (getUseURI() == false)
res = pushObjects(deletedCurSeq, carddav_delete_object, OK, RT);
else
res = pushObjects(deletedCurSeq, carddav_delete_object_by_uri, OK, RT);
}
} }
} }
#endif // if USE_CARDDAV_MODIFY #endif // if USE_CARDDAV_MODIFY

Write Preview
Loading…
Cancel
Save