summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-07-09 12:00:17 (UTC)
committer zautrix <zautrix>2005-07-09 12:00:17 (UTC)
commitfa0b6f9dae69ae7ac610b2bc97ca79b74d04f5e5 (patch) (side-by-side diff)
treeb8d4b3cec0f447fb2930fe2ab9cd191bf7e015d0 /korganizer
parent2e2d9a949b8273ad52b09ffdf2c9250acfdbe6db (diff)
downloadkdepimpi-fa0b6f9dae69ae7ac610b2bc97ca79b74d04f5e5.zip
kdepimpi-fa0b6f9dae69ae7ac610b2bc97ca79b74d04f5e5.tar.gz
kdepimpi-fa0b6f9dae69ae7ac610b2bc97ca79b74d04f5e5.tar.bz2
fixx
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a350c3b..7044e90 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1443,3 +1443,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
if ( !skipIncidence ) {
- inL = local->incidence( uid );
+ inL = local->incidenceForUid( uid , false );
if ( inL ) { // maybe conflict - same uid in both calendars
@@ -1466,2 +1466,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
} else {// take remote **********************
+ if ( !inL->isReadOnly() ) {
idS = inL->IDStr();
@@ -1483,2 +1484,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
}
+ }
} else { // no conflict ********** add or delete remote
@@ -1551,3 +1553,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
if ( !skipIncidence ) {
- inR = remote->incidence( uid );
+ inR = remote->incidenceForUid( uid , true );
if ( ! inR ) {