1 files changed, 36 insertions, 27 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
+    // ********** setting filters ****************
+    Filter filterIN  = mViewManager->getFilterByName( syncManager->mFilterInAB );
+    Filter filterOUT = mViewManager->getFilterByName( syncManager->mFilterOutAB );
+   
    //qDebug("*************************** ");
@@ -2948,30 +2953,32 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
            } else { //  no conflict ********** add or delete remote 
-                if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+                if ( filterIN.name().isEmpty() || filterIN.filterAddressee( inR ) ) {
-                    QString des = addresseeLSync.note(); 
+                    if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
-                    if ( des.find( inR.getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
+                        QString des = addresseeLSync.note(); 
-                        inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE );
+                        if ( des.find( inR.getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
-                        remote->insertAddressee( inR, false );
+                            inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE );
-                        ++deletedAddresseeR; 
+                            remote->insertAddressee( inR, false );
-                    } else {
+                            ++deletedAddresseeR; 
-                        inR.setRevision( modifiedCalendar );
+                        } else {
-                        remote->insertAddressee( inR, false );
+                            inR.setRevision( modifiedCalendar );
-                        inL = inR; 
+                            remote->insertAddressee( inR, false );
-                        inL.setIDStr( ":" );
+                            inL = inR; 
-                        inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
+                            inL.setIDStr( ":" );
-                        inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
+                            inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
-                        inL.setResource( 0 );
+                            inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
-                        local->insertAddressee( inL , false);
+                            inL.setResource( 0 );
-                        ++addedAddressee;
+                            local->insertAddressee( inL , false);
-                    }
+                            ++addedAddressee;
-                } else {
+                        }
-                    if ( inR.revision() > mLastAddressbookSync || mode == 5 ) {
-                        inR.setRevision( modifiedCalendar );
-                        remote->insertAddressee( inR, false );
-                        inR.setResource( 0 );
-                        local->insertAddressee( inR, false );
-                        ++addedAddressee;
                    } else {
-                        // pending checkExternSyncAddressee(addresseeRSyncSharp, inR);
+                        if ( inR.revision() > mLastAddressbookSync || mode == 5 ) {
-                        remote->removeAddressee( inR );
+                            inR.setRevision( modifiedCalendar );
-                        ++deletedAddresseeR; 
+                            remote->insertAddressee( inR, false );
+                            inR.setResource( 0 );
+                            local->insertAddressee( inR, false );
+                            ++addedAddressee;
+                        } else {
+                            // pending checkExternSyncAddressee(addresseeRSyncSharp, inR);
+                            remote->removeAddressee( inR );
+                            ++deletedAddresseeR; 
+                        }
                    }
@@ -2998,2 +3005,4 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
            skipIncidence = true;
+        if ( !filterOUT.name().isEmpty() && ! filterOUT.filterAddressee( inL ) )
+            skipIncidence = true;
        if ( !skipIncidence )  {

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,30 +2953,32 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
2948	} else { // no conflict ********** add or delete remote	2953	} else { // no conflict ********** add or delete remote
2949	if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {	2954	if ( filterIN.name().isEmpty() \|\| filterIN.filterAddressee( inR ) ) {
2950	QString des = addresseeLSync.note();	2955	if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
2951	if ( des.find( inR.getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it	2956	QString des = addresseeLSync.note();
2952	inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE );	2957	if ( des.find( inR.getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it
2953	remote->insertAddressee( inR, false );	2958	inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE );
2954	++deletedAddresseeR;	2959	remote->insertAddressee( inR, false );
2955	} else {	2960	++deletedAddresseeR;
2956	inR.setRevision( modifiedCalendar );	2961	} else {
2957	remote->insertAddressee( inR, false );	2962	inR.setRevision( modifiedCalendar );
2958	inL = inR;	2963	remote->insertAddressee( inR, false );
2959	inL.setIDStr( ":" );	2964	inL = inR;
2960	inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );	2965	inL.setIDStr( ":" );
2961	inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );	2966	inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
2962	inL.setResource( 0 );	2967	inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
2963	local->insertAddressee( inL , false);	2968	inL.setResource( 0 );
2964	++addedAddressee;	2969	local->insertAddressee( inL , false);
2965	}	2970	++addedAddressee;
2966	} else {	2971	}
2967	if ( inR.revision() > mLastAddressbookSync \|\| mode == 5 ) {
2968	inR.setRevision( modifiedCalendar );
2969	remote->insertAddressee( inR, false );
2970	inR.setResource( 0 );
2971	local->insertAddressee( inR, false );
2972	++addedAddressee;
2973	} else {	2972	} else {
2974	// pending checkExternSyncAddressee(addresseeRSyncSharp, inR);	2973	if ( inR.revision() > mLastAddressbookSync \|\| mode == 5 ) {
2975	remote->removeAddressee( inR );	2974	inR.setRevision( modifiedCalendar );
2976	++deletedAddresseeR;	2975	remote->insertAddressee( inR, false );
		2976	inR.setResource( 0 );
		2977	local->insertAddressee( inR, false );
		2978	++addedAddressee;
		2979	} else {
		2980	// pending checkExternSyncAddressee(addresseeRSyncSharp, inR);
		2981	remote->removeAddressee( inR );
		2982	++deletedAddresseeR;
		2983	}
2977	}	2984	}
@@ -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 ) {