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

* Fixed CalDAV resource error messages and potential crash

Browse Source 
* Added write support to events with RECURRENCE-ID property
  Only remaining potential issue is modification of parent series and association/update/delete of child event RECURRENCE-ID fields


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1169262 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent ba9ae64c03
commit 5abbdb459b
3 changed files with 67 additions and 52 deletions
Show Stats Download Patch File Download Diff File

17
kresources/caldav/reader.cpp
Unescape View File

@ -40,12 +40,14 @@ int CalDavReader::runJob(runtime_info* RT) {
response* result = caldav_get_response(); response* result = caldav_get_response();
CALDAV_RESPONSE res = OK; CALDAV_RESPONSE res = OK;
if (mGetAll) { if ((OK == res) && (url() != "")) {
kdDebug() << "getting all objects"; if (mGetAll) {
res = caldav_getall_object(result, std::string(url().ascii()).c_str(), RT); kdDebug() << "getting all objects";
} else { res = caldav_getall_object(result, std::string(url().ascii()).c_str(), RT);
kdDebug() << "getting object from the specified time range"; } else {
res = caldav_get_object(result, mTimeStart.toTime_t(), mTimeEnd.toTime_t(), std::string(url().ascii()).c_str(), RT); kdDebug() << "getting object from the specified time range";
res = caldav_get_object(result, mTimeStart.toTime_t(), mTimeEnd.toTime_t(), std::string(url().ascii()).c_str(), RT);
}
} }
if (OK == res) { if (OK == res) {
@ -64,8 +66,7 @@ int CalDavReader::runJob(runtime_info* RT) {
if ((OK == res) && (tasksUrl() != "")) { if ((OK == res) && (tasksUrl() != "")) {
kdDebug() << "reader::run, url: " << tasksUrl(); kdDebug() << "reader::run, url: " << tasksUrl();
response* result = caldav_get_response(); result = caldav_get_response();
CALDAV_RESPONSE res = OK;
if (mGetAll) { if (mGetAll) {
kdDebug() << "getting all objects"; kdDebug() << "getting all objects";

80
kresources/caldav/writer.cpp
Unescape View File

@ -49,54 +49,56 @@ int CalDavWriter::runJob(runtime_info* RT) {
int res = OK; int res = OK;
kdDebug() << "pushing added objects"; if ((OK == res) && (url() != "")) {
res = pushObjects(mAdded, caldav_add_object, OK, RT); kdDebug() << "pushing added objects";
if (OK == res) { res = pushObjects(mAdded, caldav_add_object, OK, RT);
if (OK == res) {
#ifdef USE_CALDAV_MODIFY #ifdef USE_CALDAV_MODIFY
kdDebug() << "pushing changed objects"; kdDebug() << "pushing changed objects";
res = pushObjects(mChanged, caldav_modify_object, OK, RT); res = pushObjects(mChanged, caldav_modify_object, OK, RT);
if (OK == res) { if (OK == res) {
kdDebug() << "pushing deleted objects"; kdDebug() << "pushing deleted objects";
res = pushObjects(mDeleted, caldav_delete_object, OK, RT); res = pushObjects(mDeleted, caldav_delete_object, OK, RT);
} }
#else // if USE_CALDAV_MODIFY #else // if USE_CALDAV_MODIFY
kdDebug() << "pushing changed objects (delete)"; kdDebug() << "pushing changed objects (delete)";
res = pushObjects(mChanged, caldav_delete_object, OK, RT); res = pushObjects(mChanged, caldav_delete_object, OK, RT);
if (OK == res) { if (OK == res) {
kdDebug() << "pushing changed objects (add)"; kdDebug() << "pushing changed objects (add)";
res = pushObjects(mChanged, caldav_add_object, OK, RT); res = pushObjects(mChanged, caldav_add_object, OK, RT);
if (OK == res) { if (OK == res) {
kdDebug() << "pushing deleted objects"; kdDebug() << "pushing deleted objects";
res = pushObjects(mDeleted, caldav_delete_object, OK, RT); res = pushObjects(mDeleted, caldav_delete_object, OK, RT);
} }
} }
#endif // if USE_CALDAV_MODIFY #endif // if USE_CALDAV_MODIFY
}
} }
res = OK;
kdDebug() << "pushing added tasks objects";
res = pushTasksObjects(mTasksAdded, caldav_add_object, OK, RT);
if ((OK == res) && (tasksUrl() != "")) { if ((OK == res) && (tasksUrl() != "")) {
kdDebug() << "pushing added tasks objects";
res = pushTasksObjects(mTasksAdded, caldav_add_object, OK, RT);
if (OK == res) {
#ifdef USE_CALDAV_TASKS_MODIFY #ifdef USE_CALDAV_TASKS_MODIFY
kdDebug() << "pushing changed objects"; kdDebug() << "pushing changed objects";
res = pushTasksObjects(mTasksChanged, caldav_tasks_modify_object, OK, RT); res = pushTasksObjects(mTasksChanged, caldav_tasks_modify_object, OK, RT);
if (OK == res) { if (OK == res) {
kdDebug() << "pushing deleted objects"; kdDebug() << "pushing deleted objects";
res = pushTasksObjects(mTasksDeleted, caldav_tasks_delete_object, OK, RT); res = pushTasksObjects(mTasksDeleted, caldav_tasks_delete_object, OK, RT);
} }
#else // if USE_CALDAV_TASKS_MODIFY #else // if USE_CALDAV_TASKS_MODIFY
kdDebug() << "pushing changed objects (delete)"; kdDebug() << "pushing changed objects (delete)";
res = pushTasksObjects(mTasksChanged, caldav_tasks_delete_object, OK, RT); res = pushTasksObjects(mTasksChanged, caldav_tasks_delete_object, OK, RT);
if (OK == res) { if (OK == res) {
kdDebug() << "pushing changed objects (add)"; kdDebug() << "pushing changed objects (add)";
res = pushTasksObjects(mTasksChanged, caldav_add_object, OK, RT); res = pushTasksObjects(mTasksChanged, caldav_add_object, OK, RT);
if (OK == res) { if (OK == res) {
kdDebug() << "pushing deleted objects"; kdDebug() << "pushing deleted objects";
res = pushTasksObjects(mTasksDeleted, caldav_tasks_delete_object, OK, RT); res = pushTasksObjects(mTasksDeleted, caldav_tasks_delete_object, OK, RT);
} }
} }
#endif // if USE_CALDAV_TASKS_MODIFY #endif // if USE_CALDAV_TASKS_MODIFY
}
} }
if (OK != res) { if (OK != res) {

22
libkcal/resourcecached.cpp
Unescape View File

@ -487,12 +487,24 @@ void ResourceCached::calendarIncidenceDeleted( Incidence *i )
<< i->uid() << endl; << i->uid() << endl;
#endif #endif
TQMap<Incidence *,bool>::ConstIterator it; if (i->hasRecurrenceID()) {
it = mDeletedIncidences.find( i ); // This incidence has a parent; notify the parent of the child's death and do not destroy the parent!
if ( it == mDeletedIncidences.end() ) { // Get the parent
mDeletedIncidences.insert( i, true ); IncidenceList il = i->childIncidences();
IncidenceListIterator it;
it = il.begin();
Incidence *parentIncidence;
parentIncidence = this->incidence(*it);
// Remove the child
calendarIncidenceChanged(parentIncidence);
}
else {
TQMap<Incidence *,bool>::ConstIterator it;
it = mDeletedIncidences.find( i );
if ( it == mDeletedIncidences.end() ) {
mDeletedIncidences.insert( i, true );
}
} }
checkForAutomaticSave(); checkForAutomaticSave();
} }

Write Preview
Loading…
Cancel
Save