-rw-r--r-- | korganizer/calendarview.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 02c5e45..685bb60 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1069,2 +1069,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1069 | } else { // no conflict ********** add or delete remote | 1069 | } else { // no conflict ********** add or delete remote |
1070 | if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ | ||
1070 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1071 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
@@ -1079,3 +1080,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1079 | } else { | 1080 | } else { |
1080 | if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ | ||
1081 | inR->setLastModified( modifiedCalendar ); | 1081 | inR->setLastModified( modifiedCalendar ); |
@@ -1087,3 +1087,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1087 | ++addedEvent; | 1087 | ++addedEvent; |
1088 | } | 1088 | |
1089 | } | 1089 | } |
@@ -1091,3 +1091,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1091 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { | 1091 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { |
1092 | if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ | ||
1093 | inR->setLastModified( modifiedCalendar ); | 1092 | inR->setLastModified( modifiedCalendar ); |
@@ -1097,3 +1096,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1097 | ++addedEvent; | 1096 | ++addedEvent; |
1098 | } | 1097 | |
1099 | } else { | 1098 | } else { |
@@ -1106,2 +1105,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1106 | } | 1105 | } |
1106 | } | ||
1107 | inR = er.next(); | 1107 | inR = er.next(); |
@@ -1130,2 +1130,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1130 | skipIncidence = true; | 1130 | skipIncidence = true; |
1131 | if ( filterOUT && ! filterOUT->filterCalendarItem( inL ) ){ | ||
1132 | skipIncidence = true; | ||
1133 | } | ||
1131 | if ( !skipIncidence ) { | 1134 | if ( !skipIncidence ) { |
@@ -1140,3 +1143,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1140 | if ( ! mSyncManager->mWriteBackExistingOnly ) { | 1143 | if ( ! mSyncManager->mWriteBackExistingOnly ) { |
1141 | if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ | ||
1142 | inL->removeID(mCurrentSyncDevice ); | 1144 | inL->removeID(mCurrentSyncDevice ); |
@@ -1151,3 +1153,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1151 | } | 1153 | } |
1152 | } | ||
1153 | } else { | 1154 | } else { |
@@ -1159,3 +1160,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1159 | if ( ! mSyncManager->mWriteBackExistingOnly ) { | 1160 | if ( ! mSyncManager->mWriteBackExistingOnly ) { |
1160 | if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ | ||
1161 | ++addedEventR; | 1161 | ++addedEventR; |
@@ -1170,3 +1170,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1170 | } | 1170 | } |
1171 | } | ||
1172 | inL = el.next(); | 1171 | inL = el.next(); |