| author | zautrix <zautrix> | 2005-01-17 12:39:45 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-01-17 12:39:45 (UTC) |
| commit | ba5e5a22ad492f798b2626026cc1838b731e055b (patch) (side-by-side diff) | |
| tree | f8bdea9f3a7542371b5be6e5a30ba533889a2075 /kaddressbook | |
| parent | 6b166ece0a576e9be9c71a61fab5424d75a9301f (diff) | |
| download | kdepimpi-ba5e5a22ad492f798b2626026cc1838b731e055b.zip kdepimpi-ba5e5a22ad492f798b2626026cc1838b731e055b.tar.gz kdepimpi-ba5e5a22ad492f798b2626026cc1838b731e055b.tar.bz2 | |
more AB fixes
| -rw-r--r-- | kaddressbook/kabcore.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index aa04631..a480baf 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2802,2 +2802,4 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo int changedRemote = 0; + int filteredIN = 0; + int filteredOUT = 0; @@ -2991,2 +2993,4 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo } + } else { + ++filteredIN; } @@ -3014,9 +3018,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo inL = local->findByUid( uid ); - if ( (!filterOUT.name().isEmpty()) && (! filterOUT.filterAddressee( inL ) ) ) - skipIncidence = true; - } - if ( !skipIncidence ) { if ( !inL.resource() || inL.resource()->includeInSync() ) { inR = remote->findByUid( uid ); - if ( inR.isEmpty() ) { // no conflict ********** add or delete local + if ( inR.isEmpty() ){ + if ( filterOUT.name().isEmpty() || filterOUT.filterAddressee( inL ) ) { + // no conflict ********** add or delete local if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { @@ -3056,2 +3058,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo } + } else { + ++filteredOUT; + } } @@ -3082,3 +3087,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo 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"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); + 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"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR, filteredIN, filteredOUT ); qDebug( mes ); |