summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressbook.cpp9
-rw-r--r--kaddressbook/kabcore.cpp20
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
@@ -452,2 +452,5 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev )
452 if ( a.uid() == (*it).uid() ) { 452 if ( a.uid() == (*it).uid() ) {
453 if ( setRev && (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
454 return;
455 }
453 bool changed = false; 456 bool changed = false;
@@ -463,2 +466,3 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev )
463 if ( setRev ) { 466 if ( setRev ) {
467
464 // get rid of micro seconds 468 // get rid of micro seconds
@@ -527,3 +531,3 @@ Addressee::List AddressBook::getExternLastSyncAddressees()
527 for ( it = begin(); it != end(); ++it ) { 531 for ( it = begin(); it != end(); ++it ) {
528 if ( (*it).uid().left( 20 ) == "last-syncAddressee-" ) { 532 if ( (*it).uid().left( 19 ) == "last-syncAddressee-" ) {
529 if ( (*it).familyName().left(3) == "E: " ) 533 if ( (*it).familyName().left(3) == "E: " )
@@ -557,3 +561,4 @@ Addressee::List AddressBook::allAddressees()
557{ 561{
558 return d->mAddressees; 562 return d->mAddressees;
563
559} 564}
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 215ce83..74c10d2 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2530,3 +2530,3 @@ KABC::Addressee KABCore::getLastSyncAddressee()
2530 sum = "E: "; 2530 sum = "E: ";
2531 lse.setFamilyName(sum+mCurrentSyncDevice + i18n(" - sync event")); 2531 lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event"));
2532 lse.setRevision( mLastAddressbookSync ); 2532 lse.setRevision( mLastAddressbookSync );
@@ -2765,3 +2765,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
2765 bool skipIncidence = false; 2765 bool skipIncidence = false;
2766 if ( uid.left(20) == QString("last-syncAddressee-") ) 2766 if ( uid.left(19) == QString("last-syncAddressee-") )
2767 skipIncidence = true; 2767 skipIncidence = true;
@@ -2852,3 +2852,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
2852 bool skipIncidence = false; 2852 bool skipIncidence = false;
2853 if ( uid.left(20) == QString("last-syncAddressee-") ) 2853 if ( uid.left(19) == QString("last-syncAddressee-") )
2854 skipIncidence = true; 2854 skipIncidence = true;
@@ -2899,5 +2899,2 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
2899 el.clear(); 2899 el.clear();
2900
2901
2902
2903 bar.hide(); 2900 bar.hide();
@@ -2909,4 +2906,9 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
2909 addresseeRSync.setRevision( mLastAddressbookSync ); 2906 addresseeRSync.setRevision( mLastAddressbookSync );
2910 addresseeRSync.setGivenName( i18n("Remote from: ")+mCurrentSyncName ) ; 2907 addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ;
2911 addresseeLSync.setGivenName(i18n("Local from: ") + mCurrentSyncName ); 2908 addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName );
2909 addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ;
2910 addresseeLSync.setGivenName(i18n("!DO NOT EDIT!") );
2911 addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ;
2912 addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() );
2913
2912 if ( mGlobalSyncMode == SYNC_MODE_NORMAL) 2914 if ( mGlobalSyncMode == SYNC_MODE_NORMAL)
@@ -2917,3 +2919,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
2917 if ( KABPrefs::instance()->mShowSyncSummary ) { 2919 if ( KABPrefs::instance()->mShowSyncSummary ) {
2918 KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); 2920 KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") );
2919 } 2921 }