summaryrefslogtreecommitdiffstats
path: root/libkcal
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-29 18:08:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-29 18:08:07 +0000
commit8ce63b1df3d811bb203a9e88cb23ea9a70216c35 (patch)
treed88cbcc03d717201bf5667220290be2d9d6dca22 /libkcal
parent5abbdb459be7870848ef16691174e91c68958304 (diff)
downloadtdepim-8ce63b1df3d811bb203a9e88cb23ea9a70216c35.tar.gz
tdepim-8ce63b1df3d811bb203a9e88cb23ea9a70216c35.zip
* 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
Diffstat (limited to 'libkcal')
-rw-r--r--libkcal/calendar.cpp2
-rw-r--r--libkcal/calendarresources.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index 0be3dffcd..65afb77e7 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -328,6 +328,8 @@ Incidence *Calendar::dissociateOccurrence( Incidence *incidence, TQDate date,
Incidence *newInc = incidence->clone();
newInc->recreate();
+ newInc->setHasRecurrenceID(false);
+ newInc->setRecurrenceID(QString());
newInc->setRelatedTo( incidence );
Recurrence *recur = newInc->recurrence();
if ( single ) {
diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h
index 1858a85b2..9d3436348 100644
--- a/libkcal/calendarresources.h
+++ b/libkcal/calendarresources.h
@@ -177,7 +177,7 @@ class LIBKCAL_EXPORT CalendarResources :
/**
* Reloads all incidences from all resources.
- * @par tz The timezone to set.
+ * @param tz The timezone to set.
* @return success or failure
*/
bool reload( const TQString &tz );
@@ -293,7 +293,7 @@ class LIBKCAL_EXPORT CalendarResources :
/**
Add a Resource to the Calendar.
This method must be public, because in-process added Resources
- do not emit the corresponding signal, so this methodd has to be
+ do not emit the corresponding signal, so this method has to be
called manually!
@param resource is a pointer to the ResourceCalendar to add.