-rw-r--r-- | korganizer/calendarview.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 1f8ad5b..f727cd4 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -929,12 +929,17 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
929 | Event* eventRSync; | 929 | Event* eventRSync; |
930 | Event* eventLSync; | 930 | Event* eventLSync; |
931 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); | 931 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); |
932 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); | 932 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); |
933 | bool fullDateRange = false; | 933 | bool fullDateRange = false; |
934 | local->resetTempSyncStat(); | 934 | local->resetTempSyncStat(); |
935 | #ifdef DESKTOP_VERSION | ||
936 | //Needed for KDE - OL sync | ||
937 | local->resetPilotStat(); | ||
938 | remote->resetPilotStat(); | ||
939 | #endif | ||
935 | mLastCalendarSync = QDateTime::currentDateTime(); | 940 | mLastCalendarSync = QDateTime::currentDateTime(); |
936 | QDateTime modifiedCalendar = mLastCalendarSync;; | 941 | QDateTime modifiedCalendar = mLastCalendarSync;; |
937 | eventLSync = getLastSyncEvent(); | 942 | eventLSync = getLastSyncEvent(); |
938 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); | 943 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); |
939 | if ( eventR ) { | 944 | if ( eventR ) { |
940 | eventRSync = (Event*) eventR->clone(); | 945 | eventRSync = (Event*) eventR->clone(); |
@@ -1023,12 +1028,15 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1023 | inL->setRevision( maxrev ); | 1028 | inL->setRevision( maxrev ); |
1024 | inR = inL->clone(); | 1029 | inR = inL->clone(); |
1025 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 1030 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
1026 | if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL ) | 1031 | if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL ) |
1027 | inR->setIDStr( idS ); | 1032 | inR->setIDStr( idS ); |
1028 | remote->addIncidence( inR ); | 1033 | remote->addIncidence( inR ); |
1034 | #ifdef DESKTOP_VERSION | ||
1035 | inR->setPilotId( 1 ); | ||
1036 | #endif | ||
1029 | ++changedRemote; | 1037 | ++changedRemote; |
1030 | } else { | 1038 | } else { |
1031 | if ( inR->revision() < maxrev ) | 1039 | if ( inR->revision() < maxrev ) |
1032 | inR->setRevision( maxrev ); | 1040 | inR->setRevision( maxrev ); |
1033 | idS = inL->IDStr(); | 1041 | idS = inL->IDStr(); |
1034 | local->deleteIncidence( inL ); | 1042 | local->deleteIncidence( inL ); |