| -rw-r--r-- | kaddressbook/kabcore.cpp | 63 |
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 @@ -2864,12 +2864,17 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo if ( mCurrentSyncDevice == "deleteaftersync" ) { mLastAddressbookSync = loadedFileVersion; qDebug("setting mLastAddressbookSync "); } #endif + + // ********** setting filters **************** + Filter filterIN = mViewManager->getFilterByName( syncManager->mFilterInAB ); + Filter filterOUT = mViewManager->getFilterByName( syncManager->mFilterOutAB ); + //qDebug("*************************** "); // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() ); QStringList er = remote->uidList(); Addressee inR ;//= er.first(); Addressee inL; @@ -2943,40 +2948,42 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo local->insertAddressee( inL , false ); ++changedLocal; } } } } else { // no conflict ********** add or delete remote - if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { - QString des = addresseeLSync.note(); - if ( des.find( inR.getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it - inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE ); - remote->insertAddressee( inR, false ); - ++deletedAddresseeR; - } else { - inR.setRevision( modifiedCalendar ); - remote->insertAddressee( inR, false ); - inL = inR; - inL.setIDStr( ":" ); - inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); - inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); - inL.setResource( 0 ); - 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; + if ( filterIN.name().isEmpty() || filterIN.filterAddressee( inR ) ) { + if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { + QString des = addresseeLSync.note(); + if ( des.find( inR.getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it + inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE ); + remote->insertAddressee( inR, false ); + ++deletedAddresseeR; + } else { + inR.setRevision( modifiedCalendar ); + remote->insertAddressee( inR, false ); + inL = inR; + inL.setIDStr( ":" ); + inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); + inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); + inL.setResource( 0 ); + local->insertAddressee( inL , false); + ++addedAddressee; + } } else { - // pending checkExternSyncAddressee(addresseeRSyncSharp, inR); - remote->removeAddressee( inR ); - ++deletedAddresseeR; + 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); + remote->removeAddressee( inR ); + ++deletedAddresseeR; + } } } } } ++incCounter; } @@ -2993,12 +3000,14 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo if ( incCounter % modulo == 0 ) syncManager->showProgressBar(incCounter); uid = el[ incCounter ]; bool skipIncidence = false; if ( uid.left(19) == QString("last-syncAddressee-") ) skipIncidence = true; + if ( !filterOUT.name().isEmpty() && ! filterOUT.filterAddressee( inL ) ) + skipIncidence = true; if ( !skipIncidence ) { inL = local->findByUid( uid ); if ( !inL.resource() || inL.resource()->includeInSync() ) { inR = remote->findByUid( uid ); if ( inR.isEmpty() ) { // no conflict ********** add or delete local if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |