| -rw-r--r-- | kaddressbook/kabcore.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 6e482b5..e6bdde9 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2244,3 +2244,3 @@ void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString - qDebug("found birthday in KA/Pi: %s,%s,%s,%s: %s, %s", (*it).realName().latin1(), (*it).preferredEmail().latin1(), (*it).assembledName().latin1(), (*it).uid().latin1(), formattedbday.latin1(), anni.latin1() ); + //qDebug("found birthday in KA/Pi: %s,%s,%s,%s: %s, %s", (*it).realName().latin1(), (*it).preferredEmail().latin1(), (*it).assembledName().latin1(), (*it).uid().latin1(), formattedbday.latin1(), anni.latin1() ); } @@ -2256,3 +2256,3 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses { - qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1()); + //qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1()); @@ -2291,3 +2291,3 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses emaillist = mAddressBook->findByEmail( email ); - qDebug("count %d %d ", namelist.count(),emaillist.count() ); + //qDebug("count %d %d ", namelist.count(),emaillist.count() ); //check if we have a match in Namelist and Emaillist @@ -2408,6 +2408,6 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); - qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); + //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); locCh = ( localMod > mLastAddressbookSync ); if ( !remCh && ! locCh ) { - qDebug("both not changed "); + //qDebug("both not changed "); lastSync = localMod.addDays(1); @@ -2417,3 +2417,3 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i if ( locCh ) { - qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); + //qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); lastSync = localMod.addDays( -1 ); @@ -2422,6 +2422,6 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i } else { - qDebug(" not loc changed "); + //qDebug(" not loc changed "); lastSync = localMod.addDays( 1 ); if ( remCh ) { - qDebug("rem changed "); + //qDebug("rem changed "); remoteMod =( lastSync.addDays( 1 ) ); @@ -2439,4 +2439,4 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i } - qDebug("%s %s --- %d %d", localMod.toString().latin1() , remoteMod.toString().latin1(), localMod.time().msec(), remoteMod.time().msec()); - qDebug("lastsync %s ", lastSync.toString().latin1() ); + //qDebug("%s %s --- %d %d", localMod.toString().latin1() , remoteMod.toString().latin1(), localMod.time().msec(), remoteMod.time().msec()); + //qDebug("lastsync %s ", lastSync.toString().latin1() ); //full = true; //debug only @@ -2445,3 +2445,3 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i if ( equ ) { - qDebug("equal "); + //qDebug("equal "); if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { @@ -2558,3 +2558,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo } else { - qDebug("FULLDATE 1"); + //qDebug("FULLDATE 1"); fullDateRange = true; @@ -2569,3 +2569,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo if ( addresseeLSync.revision() == mLastAddressbookSync ) { - qDebug("FULLDATE 2"); + // qDebug("FULLDATE 2"); fullDateRange = true; @@ -2578,3 +2578,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo fullDateRange = true; - qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() ); + //qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() ); } @@ -2858,2 +2858,3 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) } + abLocal.removeResources(); if ( syncOK ) @@ -2896,2 +2897,3 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) } + abLocal.removeResources(); if ( syncOK ) @@ -2935,2 +2937,3 @@ bool KABCore::syncPhone() } + abLocal.removeResources(); if ( syncOK ) |