summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 685bb60..da1edea 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -926,2 +926,4 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
int changedRemote = 0;
+ int filteredIN = 0;
+ int filteredOUT = 0;
//QPtrList<Event> el = local->rawEvents();
@@ -1103,2 +1105,4 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
}
+ } else {
+ ++filteredIN;
}
@@ -1130,8 +1134,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
skipIncidence = true;
- if ( filterOUT && ! filterOUT->filterCalendarItem( inL ) ){
- skipIncidence = true;
- }
if ( !skipIncidence ) {
inR = remote->incidence( uid );
- if ( ! inR ) { // no conflict ********** add or delete local
+ if ( ! inR ) {
+ if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){
+ // no conflict ********** add or delete local
if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
@@ -1168,2 +1171,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
}
+ } else {
+ ++filteredOUT;
+ }
}
@@ -1220,3 +1226,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
QString mes;
- mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR );
+ mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR, filteredIN, filteredOUT );
QString delmess;