-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 284ddbf..2ccccfa 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -960,7 +960,10 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
960 | fullDateRange = true; | 960 | fullDateRange = true; |
961 | } | 961 | } |
962 | } | 962 | } |
963 | if ( fullDateRange && !mSyncKDE ) | 963 | if ( mSyncKDE ) { |
964 | fullDateRange = ( eventLSync->dtStart() == mLastCalendarSync ); | ||
965 | } | ||
966 | if ( fullDateRange ) | ||
964 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); | 967 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); |
965 | else | 968 | else |
966 | mLastCalendarSync = eventLSync->dtStart(); | 969 | mLastCalendarSync = eventLSync->dtStart(); |
@@ -1049,13 +1052,16 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1049 | } else { | 1052 | } else { |
1050 | inR->setLastModified( modifiedCalendar ); | 1053 | inR->setLastModified( modifiedCalendar ); |
1051 | inL = inR->clone(); | 1054 | inL = inR->clone(); |
1055 | inL->setIDStr( ":" ); | ||
1052 | local->addIncidence( inL ); | 1056 | local->addIncidence( inL ); |
1053 | ++addedEvent; | 1057 | ++addedEvent; |
1054 | } | 1058 | } |
1055 | } else { | 1059 | } else { |
1056 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { | 1060 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { |
1057 | inR->setLastModified( modifiedCalendar ); | 1061 | inR->setLastModified( modifiedCalendar ); |
1058 | local->addIncidence( inR->clone() ); | 1062 | inL = inR->clone(); |
1063 | inL->setIDStr( ":" ); | ||
1064 | local->addIncidence( inL ); | ||
1059 | ++addedEvent; | 1065 | ++addedEvent; |
1060 | } else { | 1066 | } else { |
1061 | checkExternSyncEvent(eventRSyncSharp, inR); | 1067 | checkExternSyncEvent(eventRSyncSharp, inR); |
@@ -1104,6 +1110,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1104 | //qDebug("remote added Incidence %s ", inL->summary().latin1()); | 1110 | //qDebug("remote added Incidence %s ", inL->summary().latin1()); |
1105 | inL->setLastModified( modifiedCalendar ); | 1111 | inL->setLastModified( modifiedCalendar ); |
1106 | inR = inL->clone(); | 1112 | inR = inL->clone(); |
1113 | inR->setIDStr( ":" ); | ||
1107 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 1114 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
1108 | remote->addIncidence( inR ); | 1115 | remote->addIncidence( inR ); |
1109 | } | 1116 | } |
@@ -1117,7 +1124,9 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1117 | if ( ! mSyncManager->mWriteBackExistingOnly ) { | 1124 | if ( ! mSyncManager->mWriteBackExistingOnly ) { |
1118 | ++addedEventR; | 1125 | ++addedEventR; |
1119 | inL->setLastModified( modifiedCalendar ); | 1126 | inL->setLastModified( modifiedCalendar ); |
1120 | remote->addIncidence( inL->clone() ); | 1127 | inR = inL->clone(); |
1128 | inR->setIDStr( ":" ); | ||
1129 | remote->addIncidence( inR ); | ||
1121 | } | 1130 | } |
1122 | } | 1131 | } |
1123 | } | 1132 | } |