author | zautrix <zautrix> | 2004-09-14 01:59:37 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-14 01:59:37 (UTC) |
commit | 739fec31c8cea89dd40ff1ce7dd7b84b05e4e973 (patch) (unidiff) | |
tree | e632528a6825911b1b7ae9db9af4e4c8984e6dbf /korganizer/calendarview.cpp | |
parent | 30762fe125216362e1a6c1d5ec5d22d9525aa336 (diff) | |
download | kdepimpi-739fec31c8cea89dd40ff1ce7dd7b84b05e4e973.zip kdepimpi-739fec31c8cea89dd40ff1ce7dd7b84b05e4e973.tar.gz kdepimpi-739fec31c8cea89dd40ff1ce7dd7b84b05e4e973.tar.bz2 |
Sync fixes
-rw-r--r-- | korganizer/calendarview.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 94cc97d..ce41fbd 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1015,3 +1015,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1015 | skipIncidence = true; | 1015 | skipIncidence = true; |
1016 | 1016 | QString idS; | |
1017 | qApp->processEvents(); | 1017 | qApp->processEvents(); |
@@ -1028,3 +1028,6 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1028 | if ( take == 1 ) {// take local | 1028 | if ( take == 1 ) {// take local |
1029 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); | 1029 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) |
1030 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); | ||
1031 | else | ||
1032 | idS = inR->IDStr(); | ||
1030 | remote->deleteIncidence( inR ); | 1033 | remote->deleteIncidence( inR ); |
@@ -1034,2 +1037,4 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1034 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 1037 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
1038 | if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL ) | ||
1039 | inR->setIDStr( idS ); | ||
1035 | remote->addIncidence( inR ); | 1040 | remote->addIncidence( inR ); |
@@ -1039,4 +1044,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1039 | inR->setRevision( maxrev ); | 1044 | inR->setRevision( maxrev ); |
1045 | idS = inL->IDStr(); | ||
1040 | local->deleteIncidence( inL ); | 1046 | local->deleteIncidence( inL ); |
1041 | local->addIncidence( inR->clone() ); | 1047 | inL = inR->clone(); |
1048 | inL->setIDStr( idS ); | ||
1049 | local->addIncidence( inL ); | ||
1042 | ++changedLocal; | 1050 | ++changedLocal; |
@@ -1102,2 +1110,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1102 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { | 1110 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { |
1111 | checkExternSyncEvent(eventLSyncSharp, inL); | ||
1103 | local->deleteIncidence( inL ); | 1112 | local->deleteIncidence( inL ); |