| -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 } else { // no conflict ********** add or delete remote + if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { @@ -1079,3 +1080,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } else { - if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ inR->setLastModified( modifiedCalendar ); @@ -1087,3 +1087,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int ++addedEvent; - } + } @@ -1091,3 +1091,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { - if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ inR->setLastModified( modifiedCalendar ); @@ -1097,3 +1096,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int ++addedEvent; - } + } else { @@ -1106,2 +1105,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } + } inR = er.next(); @@ -1130,2 +1130,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int skipIncidence = true; + if ( filterOUT && ! filterOUT->filterCalendarItem( inL ) ){ + skipIncidence = true; + } if ( !skipIncidence ) { @@ -1140,3 +1143,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int if ( ! mSyncManager->mWriteBackExistingOnly ) { - if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ inL->removeID(mCurrentSyncDevice ); @@ -1151,3 +1153,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } - } } else { @@ -1159,3 +1160,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int if ( ! mSyncManager->mWriteBackExistingOnly ) { - if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ ++addedEventR; @@ -1170,3 +1170,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } - } inL = el.next(); |