-rw-r--r-- | kaddressbook/kabcore.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index c6288fa..c5a36e2 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2867,6 +2867,11 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2867 | } | 2867 | } |
2868 | #endif | 2868 | #endif |
2869 | 2869 | ||
2870 | |||
2871 | // ********** setting filters **************** | ||
2872 | Filter filterIN = mViewManager->getFilterByName( syncManager->mFilterInAB ); | ||
2873 | Filter filterOUT = mViewManager->getFilterByName( syncManager->mFilterOutAB ); | ||
2874 | |||
2870 | //qDebug("*************************** "); | 2875 | //qDebug("*************************** "); |
2871 | // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() ); | 2876 | // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() ); |
2872 | QStringList er = remote->uidList(); | 2877 | QStringList er = remote->uidList(); |
@@ -2946,6 +2951,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2946 | } | 2951 | } |
2947 | } | 2952 | } |
2948 | } else { // no conflict ********** add or delete remote | 2953 | } else { // no conflict ********** add or delete remote |
2954 | if ( filterIN.name().isEmpty() || filterIN.filterAddressee( inR ) ) { | ||
2949 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2955 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2950 | QString des = addresseeLSync.note(); | 2956 | QString des = addresseeLSync.note(); |
2951 | if ( des.find( inR.getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it | 2957 | if ( des.find( inR.getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it |
@@ -2978,6 +2984,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2978 | } | 2984 | } |
2979 | } | 2985 | } |
2980 | } | 2986 | } |
2987 | } | ||
2981 | ++incCounter; | 2988 | ++incCounter; |
2982 | } | 2989 | } |
2983 | er.clear(); | 2990 | er.clear(); |
@@ -2996,6 +3003,8 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2996 | bool skipIncidence = false; | 3003 | bool skipIncidence = false; |
2997 | if ( uid.left(19) == QString("last-syncAddressee-") ) | 3004 | if ( uid.left(19) == QString("last-syncAddressee-") ) |
2998 | skipIncidence = true; | 3005 | skipIncidence = true; |
3006 | if ( !filterOUT.name().isEmpty() && ! filterOUT.filterAddressee( inL ) ) | ||
3007 | skipIncidence = true; | ||
2999 | if ( !skipIncidence ) { | 3008 | if ( !skipIncidence ) { |
3000 | inL = local->findByUid( uid ); | 3009 | inL = local->findByUid( uid ); |
3001 | if ( !inL.resource() || inL.resource()->includeInSync() ) { | 3010 | if ( !inL.resource() || inL.resource()->includeInSync() ) { |