1 files changed, 10 insertions, 16 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 6194d6d..4c4ae09 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -553,25 +553,24 @@ void AddressBook::smplifyAddressees()
         (*ait).simplifyAddresses();
     }
 }
 void AddressBook::removeSyncInfo( QString syncProfile)
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         (*ait).removeID( syncProfile );
     } 
     if ( syncProfile.isEmpty() ) {
         Iterator it = begin();
         Iterator it2 ;
-        QDateTime dt ( QDate( 2004,1,1) );
         while ( it != end() ) {
             if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                 it2 = it;
                 //qDebug("removing %s ",(*it).uid().latin1() );
                 ++it;
                 removeAddressee( it2 );
             } else  {
                 //qDebug("skipping %s ",(*it).uid().latin1() );
                 ++it;
             }
         }
     } else { 
@@ -777,59 +776,54 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev, bool takeRes
 
             if ( takeResource ) {
                 Resource * res = (*it).resource();
                 (*it) = a;
                 (*it).setResource( res );
             } else {
                 (*it) = a;
                 if ( (*it).resource() == 0 )
                     (*it).setResource( standardResource() );
             }
             if ( changed ) {
                 if ( setRev ) {
-              
-                    // get rid of micro seconds
-                    QDateTime dt =  QDateTime::currentDateTime();
-                    QTime t =  dt.time();
-                    dt.setTime( QTime (t.hour (), t.minute (), t.second () )  );
-                    (*it).setRevision( dt ); 
+                    (*it).setRevision( QDateTime::currentDateTime() ); 
                 }
                 (*it).setChanged( true );
             }
 
             found = true;
         } else {
             if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                 QString name = (*it).uid().mid( 19 );
                 Addressee b = a;
                 QString id = b.getID( name );
                 if (  ! id.isEmpty() ) {
                     QString des = (*it).note();
                     int startN;
                     if( (startN = des.find( id ) ) >= 0 ) {
                         int endN = des.find( ",", startN+1 );
                         des =  des.left( startN ) + des.mid( endN+1 );
                         (*it).setNote( des );
                     }
                 }
             }
         }
     }
     if ( found )
-        return;
+        return; 
+    
     d->mAddressees.append( a );
     Addressee& addr = d->mAddressees.last();
     if ( addr.resource() == 0 )
         addr.setResource( standardResource() );
-
     addr.setChanged( true );
 }
 
 void AddressBook::removeAddressee( const Addressee &a )
 {
   Iterator it;
   Iterator it2;
   bool found = false;
   for ( it = begin(); it != end(); ++it ) {
     if ( a.uid() == (*it).uid() ) {
         found = true;
         it2 = it;
@@ -850,45 +844,43 @@ void AddressBook::removeAddressee( const Addressee &a )
     }
   }
 
   if ( found )
       removeAddressee( it2 );
       
 }
 
 void AddressBook::removeSyncAddressees( bool removeDeleted )
 {
     Iterator it = begin();
     Iterator it2 ;
-    QDateTime dt ( QDate( 2004,1,1) );
+    QDateTime dt ( QDate( 2003,1,1) );
     while ( it != end() ) {
         (*it).setRevision( dt );
         if (( *it).IDStr() != "changed" ) { 
             // "changed" is used for tagging changed addressees when syncing with KDE or OL
             (*it).removeCustom( "KADDRESSBOOK", "X-ExternalID" );
-            (*it).setIDStr("");
+            (*it).setIDStr(":");
         }
         if ( ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE && removeDeleted  )|| (*it).uid().left( 19 ) == QString("last-syncAddressee-")) {
             it2 = it;
             //qDebug("removing %s ",(*it).uid().latin1() );
             ++it;
             removeAddressee( it2 );
         } else  {
             //qDebug("skipping %s ",(*it).uid().latin1() );
             if ( removeDeleted ) {
                 // we have no postprocessing in the resource, we have to do it here
                 // we have to compute csum for all, because it could be the first sync
                 (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
-              
-
             }
             ++it;
         }
     }
     deleteRemovedAddressees();
 }
 
 void AddressBook::removeAddressee( const Iterator &it )
 {
   d->mRemovedAddressees.append( (*it) );
   d->mAddressees.remove( it.d->mIt );
 }
@@ -922,38 +914,40 @@ void AddressBook::preExternSync( AddressBook* aBook, const QString& csd , bool i
         (*it).setID( csd, (*it).externalUID() );
         (*it).computeCsum( csd );
     }
     mergeAB( aBook ,csd, isSubset );  
 }
 void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool setID)
 {
     //qDebug("AddressBook::postExternSync ");
     AddressBook::Iterator it;  
     for ( it = begin(); it != end(); ++it ) {
         //qDebug("check uid %s ", (*it).uid().latin1() );
         if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ||
-             (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ) {
+             (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ||
+             (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL) {
             Addressee ad = aBook->findByUid( ( (*it).uid() ));
             if ( ad.isEmpty() ) {
                 qDebug("postExternSync:ERROR addressee is empty: %s ", (*it).uid().latin1());
             } else {
                 (*it).setIDStr(":");
-                (*it).computeCsum( csd );
                 if ( setID ) {
                     if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID )
                         ad.setID( csd, (*it).externalUID() );
                 } else
                     ad.setID( csd, (*it).uid() );
+                (*it).computeCsum( csd );
                 ad.setCsum( csd, (*it).getCsum( csd ) );
-                aBook->insertAddressee( ad );
+                //qDebug("CSUM %s ",(*it).getCsum( csd ).latin1() );
+                aBook->insertAddressee( ad , false);
             }
         }
     }
 }
 
 bool   AddressBook::containsExternalUid( const QString& uid  )
 {
     Iterator it;
     for ( it = begin(); it != end(); ++it ) {
         if ( uid == (*it).externalUID( ) )
             return true;
     }