summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-11-26 11:20:22 (UTC)
committer zautrix <zautrix>2005-11-26 11:20:22 (UTC)
commit85bd9f05564e566b296c949ce6e214ebdbf573ac (patch) (side-by-side diff)
treeb00eb9453ea06f2b43fd896a9a4840b7d64af69b /korganizer
parent3cd0013c04172b312ee21e80224a3b7734b4d413 (diff)
downloadkdepimpi-85bd9f05564e566b296c949ce6e214ebdbf573ac.zip
kdepimpi-85bd9f05564e566b296c949ce6e214ebdbf573ac.tar.gz
kdepimpi-85bd9f05564e566b296c949ce6e214ebdbf573ac.tar.bz2
sync
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 538325e..9571f16 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1720,3 +1720,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
if ( !skipIncidence ) {
- inL = local->incidenceForUid( uid , false );
+ inL = local->incidenceForUid( uid , false , true );
if ( inL ) { // maybe conflict - same uid in both calendars
@@ -1830,3 +1830,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
if ( !skipIncidence ) {
- inR = remote->incidenceForUid( uid , true );
+ inR = remote->incidenceForUid( uid , true, true );
if ( ! inR ) {