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
@@ -450,6 +450,9 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev )
   Addressee::List::Iterator it;
   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;
       if ( addr != (*it) )
@@ -461,6 +464,7 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev )
 
       if ( changed ) {
           if ( setRev ) {
+              
               // get rid of micro seconds
               QDateTime dt =  QDateTime::currentDateTime();
               QTime t =  dt.time();
@@ -525,7 +529,7 @@ 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 );
     }
@@ -555,7 +559,8 @@ QStringList AddressBook:: uidList()
 
 Addressee::List AddressBook::allAddressees()
 {
-  return d->mAddressees;
+   return d->mAddressees; 
+ 
 }
 
 Addressee::List AddressBook::findByName( const QString &name )
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 215ce83..74c10d2 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2528,7 +2528,7 @@ KABC::Addressee KABCore::getLastSyncAddressee()
         QString sum = "";
         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") );
         mAddressBook->insertAddressee( lse );
@@ -2763,7 +2763,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
             bar.setProgress( incCounter );
         uid = er[ incCounter ]; 
         bool skipIncidence = false;
-        if ( uid.left(20) == QString("last-syncAddressee-") )
+        if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
         QString idS;
         qApp->processEvents();
@@ -2850,7 +2850,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
             bar.setProgress( incCounter );
         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  )
             skipIncidence = true;
@@ -2897,9 +2897,6 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         ++incCounter;
     }
     el.clear();
-
- 
-    
     bar.hide();
     mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 );
     // get rid of micro seconds
@@ -2907,15 +2904,20 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () )  );
     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 );
     local->insertAddressee( addresseeLSync, false );
     QString mes;
     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 );
     return syncOK;