| -rw-r--r-- | kabc/addressbook.cpp | 9 | ||||
| -rw-r--r-- | kaddressbook/kabcore.cpp | 20 |
2 files changed, 18 insertions, 11 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index d03dea3..16e1653 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -451,4 +451,7 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev ) for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) { if ( a.uid() == (*it).uid() ) { + if ( setRev && (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) { + return; + } bool changed = false; Addressee addr = a; @@ -462,4 +465,5 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev ) if ( changed ) { if ( setRev ) { + // get rid of micro seconds QDateTime dt = QDateTime::currentDateTime(); @@ -526,5 +530,5 @@ Addressee::List AddressBook::getExternLastSyncAddressees() Iterator it; for ( it = begin(); it != end(); ++it ) { - if ( (*it).uid().left( 20 ) == "last-syncAddressee-" ) { + if ( (*it).uid().left( 19 ) == "last-syncAddressee-" ) { if ( (*it).familyName().left(3) == "E: " ) results.append( *it ); @@ -556,5 +560,6 @@ QStringList AddressBook:: uidList() Addressee::List AddressBook::allAddressees() { - return d->mAddressees; + return d->mAddressees; + } diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 215ce83..74c10d2 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2529,5 +2529,5 @@ KABC::Addressee KABCore::getLastSyncAddressee() if ( KABPrefs::instance()->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) sum = "E: "; - lse.setFamilyName(sum+mCurrentSyncDevice + i18n(" - sync event")); + lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event")); lse.setRevision( mLastAddressbookSync ); lse.setCategories( i18n("SyncEvent") ); @@ -2764,5 +2764,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo uid = er[ incCounter ]; bool skipIncidence = false; - if ( uid.left(20) == QString("last-syncAddressee-") ) + if ( uid.left(19) == QString("last-syncAddressee-") ) skipIncidence = true; QString idS; @@ -2851,5 +2851,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo uid = el[ incCounter ]; bool skipIncidence = false; - if ( uid.left(20) == QString("last-syncAddressee-") ) + if ( uid.left(19) == QString("last-syncAddressee-") ) skipIncidence = true; if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) @@ -2898,7 +2898,4 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo } el.clear(); - - - bar.hide(); mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); @@ -2908,6 +2905,11 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo addresseeLSync.setRevision( mLastAddressbookSync ); addresseeRSync.setRevision( mLastAddressbookSync ); - addresseeRSync.setGivenName( i18n("Remote from: ")+mCurrentSyncName ) ; - addresseeLSync.setGivenName(i18n("Local from: ") + mCurrentSyncName ); + addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ; + addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName ); + addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ; + addresseeLSync.setGivenName(i18n("!DO NOT EDIT!") ); + addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ; + addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() ); + if ( mGlobalSyncMode == SYNC_MODE_NORMAL) remote->insertAddressee( addresseeRSync, false ); @@ -2916,5 +2918,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); if ( KABPrefs::instance()->mShowSyncSummary ) { - KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); + KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") ); } qDebug( mes ); |