applied AB filters

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
@@ -2868,4 +2868,9 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
 #endif
 
+
+    // ********** setting filters ****************
+    Filter filterIN  = mViewManager->getFilterByName( syncManager->mFilterInAB );
+    Filter filterOUT = mViewManager->getFilterByName( syncManager->mFilterOutAB );
+   
     //qDebug("*************************** ");
     // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() );
@@ -2947,4 +2952,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                 }
             } else { //  no conflict ********** add or delete remote 
+                if ( filterIN.name().isEmpty() || filterIN.filterAddressee( inR ) ) {
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     QString des = addresseeLSync.note(); 
@@ -2979,4 +2985,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
             }
         }
+        }
         ++incCounter;
     }
@@ -2997,4 +3004,6 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
+        if ( !filterOUT.name().isEmpty() && ! filterOUT.filterAddressee( inL ) )
+            skipIncidence = true;
         if ( !skipIncidence )  {
             inL = local->findByUid( uid );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 59bddd9..9c3a641 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -619,4 +619,13 @@ QStringList ViewManager::filterNames() const
   return names;
 }
+Filter ViewManager::getFilterByName( const QString &name ) const
+{
+  Filter::List::ConstIterator it;
+  for ( it = mFilterList.begin(); it != mFilterList.end(); ++it )
+    if ( name == (*it).name() )
+      return (*it);
+
+  return Filter();
+}
 
 int ViewManager::filterPosition( const QString &name ) const
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index a03a83f..272e1b0 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -29,4 +29,5 @@
 #include <kaddressbookview.h>
 #include <qdict.h>
+#include "filter.h"
 
 class KAction;
@@ -60,4 +61,5 @@ class ViewManager : public QWidget
     void unloadViews(); 
     KSelectAction * getFilterAction() { return mActionSelectFilter; }
+    Filter getFilterByName( const QString &name ) const;
 
     QStringList selectedUids() const;