sync fixes

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 )
     if ( a.uid() == (*it).uid() ) {
+        if ( setRev && (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
+            return;
+        }
       bool changed = false;
@@ -463,2 +466,3 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev )
           if ( setRev ) {
+              
               // get rid of micro seconds
@@ -527,3 +531,3 @@ Addressee::List AddressBook::getExternLastSyncAddressees()
   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: " )
@@ -557,3 +561,4 @@ 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
@@ -2530,3 +2530,3 @@ KABC::Addressee KABCore::getLastSyncAddressee()
             sum = "E: ";
-        lse.setFamilyName(sum+mCurrentSyncDevice + i18n(" - sync event"));
+        lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event"));
         lse.setRevision( mLastAddressbookSync );
@@ -2765,3 +2765,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         bool skipIncidence = false;
-        if ( uid.left(20) == QString("last-syncAddressee-") )
+        if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
@@ -2852,3 +2852,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         bool skipIncidence = false;
-        if ( uid.left(20) == QString("last-syncAddressee-") )
+        if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
@@ -2899,5 +2899,2 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     el.clear();
-
- 
-    
     bar.hide();
@@ -2909,4 +2906,9 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     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)
@@ -2917,3 +2919,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     if ( KABPrefs::instance()->mShowSyncSummary ) {
-        KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") );
+        KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") );
     }