-rw-r--r-- | kaddressbook/kabcore.cpp | 9 | ||||
-rw-r--r-- | kaddressbook/viewmanager.cpp | 9 | ||||
-rw-r--r-- | kaddressbook/viewmanager.h | 2 |
3 files changed, 20 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 | |||
@@ -2869,2 +2869,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
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("*************************** "); |
@@ -2948,2 +2953,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
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 ) { |
@@ -2980,2 +2986,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2980 | } | 2986 | } |
2987 | } | ||
2981 | ++incCounter; | 2988 | ++incCounter; |
@@ -2998,2 +3005,4 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2998 | skipIncidence = true; | 3005 | skipIncidence = true; |
3006 | if ( !filterOUT.name().isEmpty() && ! filterOUT.filterAddressee( inL ) ) | ||
3007 | skipIncidence = true; | ||
2999 | if ( !skipIncidence ) { | 3008 | if ( !skipIncidence ) { |
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 59bddd9..9c3a641 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp | |||
@@ -620,2 +620,11 @@ QStringList ViewManager::filterNames() const | |||
620 | } | 620 | } |
621 | Filter ViewManager::getFilterByName( const QString &name ) const | ||
622 | { | ||
623 | Filter::List::ConstIterator it; | ||
624 | for ( it = mFilterList.begin(); it != mFilterList.end(); ++it ) | ||
625 | if ( name == (*it).name() ) | ||
626 | return (*it); | ||
627 | |||
628 | return Filter(); | ||
629 | } | ||
621 | 630 | ||
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h index a03a83f..272e1b0 100644 --- a/kaddressbook/viewmanager.h +++ b/kaddressbook/viewmanager.h | |||
@@ -30,2 +30,3 @@ | |||
30 | #include <qdict.h> | 30 | #include <qdict.h> |
31 | #include "filter.h" | ||
31 | 32 | ||
@@ -61,2 +62,3 @@ class ViewManager : public QWidget | |||
61 | KSelectAction * getFilterAction() { return mActionSelectFilter; } | 62 | KSelectAction * getFilterAction() { return mActionSelectFilter; } |
63 | Filter getFilterByName( const QString &name ) const; | ||
62 | 64 | ||