more AB fixes

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
@@ -2801,4 +2801,6 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     int changedLocal = 0;
     int changedRemote = 0;
+    int filteredIN = 0;
+    int filteredOUT = 0;
 
     QString mCurrentSyncName = syncManager->getCurrentSyncName();
@@ -2990,4 +2992,6 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                         }
                     }
+                } else {
+                    ++filteredIN; 
                 }
             }
@@ -3013,11 +3017,9 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         if ( ! skipIncidence ) {
             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 ) {
                         if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
@@ -3055,4 +3057,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                         }
                     }
+                    } else {
+                        ++filteredOUT; 
+                    }
                 }
             }
@@ -3081,5 +3086,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     local->insertAddressee( addresseeLSync, false );
     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 );
     mes = i18n("Local addressbook changed!\n") +mes;