summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 4667918..4e29d6f 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1018,3 +1018,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
return false;
- if ( take == 1 ) {// take local
+ if ( take == 1 ) {// take local **********************
if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL )
@@ -1032,3 +1032,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
++changedRemote;
- } else {
+ } else {// take remote **********************
idS = inL->IDStr();
@@ -1048,3 +1048,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
}
- } else { // no conflict
+ } else { // no conflict ********** add or delete remote
if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
@@ -1062,2 +1062,4 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
inL->setIDStr( ":" );
+ inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
+ inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
local->addIncidence( inL );
@@ -1106,3 +1108,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
inR = remote->incidence( uid );
- if ( ! inR ) {
+ if ( ! inR ) { // no conflict ********** add or delete local
if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {