| author | zautrix <zautrix> | 2005-07-09 12:00:17 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-07-09 12:00:17 (UTC) |
| commit | fa0b6f9dae69ae7ac610b2bc97ca79b74d04f5e5 (patch) (side-by-side diff) | |
| tree | b8d4b3cec0f447fb2930fe2ab9cd191bf7e015d0 /korganizer | |
| parent | 2e2d9a949b8273ad52b09ffdf2c9250acfdbe6db (diff) | |
| download | kdepimpi-fa0b6f9dae69ae7ac610b2bc97ca79b74d04f5e5.zip kdepimpi-fa0b6f9dae69ae7ac610b2bc97ca79b74d04f5e5.tar.gz kdepimpi-fa0b6f9dae69ae7ac610b2bc97ca79b74d04f5e5.tar.bz2 | |
fixx
| -rw-r--r-- | korganizer/calendarview.cpp | 6 |
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 @@ -1442,5 +1442,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int qApp->processEvents(); if ( !skipIncidence ) { - inL = local->incidence( uid ); + inL = local->incidenceForUid( uid , false ); if ( inL ) { // maybe conflict - same uid in both calendars if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { @@ -1465,4 +1465,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int ++changedRemote; } else {// take remote ********************** + if ( !inL->isReadOnly() ) { idS = inL->IDStr(); int pid = inL->pilotId(); @@ -1482,4 +1483,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } } + } } else { // no conflict ********** add or delete remote if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ @@ -1550,5 +1552,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int skipIncidence = true; if ( !skipIncidence ) { - inR = remote->incidence( uid ); + inR = remote->incidenceForUid( uid , true ); if ( ! inR ) { if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ |