author | zautrix <zautrix> | 2005-01-16 12:04:50 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-16 12:04:50 (UTC) |
commit | f3f63a1a1363cba9f58790812e43d6eda14f733c (patch) (side-by-side diff) | |
tree | 009a8e73b8e79bbd9d153a9cf17f258c60488fb2 /korganizer | |
parent | d57ed4438bbd6e3d9a7a0e46283d3e7645b4e47b (diff) | |
download | kdepimpi-f3f63a1a1363cba9f58790812e43d6eda14f733c.zip kdepimpi-f3f63a1a1363cba9f58790812e43d6eda14f733c.tar.gz kdepimpi-f3f63a1a1363cba9f58790812e43d6eda14f733c.tar.bz2 |
filter fix
-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 @@ -1068,4 +1068,5 @@ 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 ) { QString des = eventLSync->description(); @@ -1078,5 +1079,4 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int ++deletedEventR; } else { - if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ inR->setLastModified( modifiedCalendar ); inL = inR->clone(); @@ -1086,9 +1086,8 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int local->addIncidence( inL ); ++addedEvent; - } + } } else { if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { - if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ inR->setLastModified( modifiedCalendar ); inL = inR->clone(); @@ -1096,5 +1095,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int local->addIncidence( inL ); ++addedEvent; - } + } else { checkExternSyncEvent(eventRSyncSharp, inR); @@ -1105,4 +1104,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } } + } inR = er.next(); } @@ -1129,4 +1129,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" ) skipIncidence = true; + if ( filterOUT && ! filterOUT->filterCalendarItem( inL ) ){ + skipIncidence = true; + } if ( !skipIncidence ) { inR = remote->incidence( uid ); @@ -1139,5 +1142,4 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } else { if ( ! mSyncManager->mWriteBackExistingOnly ) { - if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ inL->removeID(mCurrentSyncDevice ); ++addedEventR; @@ -1150,5 +1152,4 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } } - } } else { if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) { @@ -1158,5 +1159,4 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } else { if ( ! mSyncManager->mWriteBackExistingOnly ) { - if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ ++addedEventR; inL->setLastModified( modifiedCalendar ); @@ -1169,5 +1169,4 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } } - } inL = el.next(); } |