1 files changed, 19 insertions, 1 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index f9e4387..fe59fcb 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -925,68 +925,86 @@ AddressBook::Iterator AddressBook::find( const Addressee &a )
   }
   return end();
 }
 
 Addressee AddressBook::findByUid( const QString &uid )
 {
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( uid == (*it).uid() ) {
       return *it;
     }
   }
   return Addressee();
 }
 void AddressBook::preExternSync( AddressBook* aBook, const QString& csd , bool isSubset )
 {
     //qDebug("AddressBook::preExternSync ");
     AddressBook::Iterator it;  
     for ( it = begin(); it != end(); ++it ) {
         (*it).setID( csd, (*it).externalUID() );
         (*it).computeCsum( csd );
     }
     mergeAB( aBook ,csd, isSubset );  
 }
+void AddressBook::preOLSync( AddressBook* aBook, const QString& csd  )
+{
+    //qDebug("AddressBook::preExternSync ");
+    AddressBook::Iterator it;  
+    for ( it = begin(); it != end(); ++it ) {
+        (*it).setID( csd, (*it).externalUID() );
+        (*it).computeCsum( csd );
+    }
+
+    Addressee ad;
+    for ( it = begin(); it != end(); ++it ) {
+        ad = aBook->findByExternUid( (*it).externalUID(), csd );
+            if ( !ad.isEmpty() ) {
+                (*it).mergeOLContact( ad );
+            }
+    }
+}
 void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool setID)
 {
     //qDebug("AddressBook::postExternSync ");
     AddressBook::Iterator it;  
     int foundEmpty = 0;
     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_ADDED_EXTERNAL) {
             Addressee ad = aBook->findByUid( ( (*it).uid() ));
             if ( ad.isEmpty() ) {
                 ++foundEmpty;
                 //qDebug("postExternSync:addressee is empty: %s ", (*it).uid().latin1());
                 //qDebug("-- formatted name %s ",(*it).formattedName().latin1() );
             } else {
                 (*it).setIDStr(":");
                 if ( setID ) {
                     if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID )
-                        ad.setID( csd, (*it).externalUID() );
+                        ad.setID( csd, (*it).externalUID() );{
+                    }
                 } else
                     ad.setID( csd, (*it).uid() );
                 (*it).computeCsum( csd );
                 ad.setCsum( csd, (*it).getCsum( csd ) );
                 //qDebug("CSUM %s ",(*it).getCsum( csd ).latin1() );
                 aBook->insertAddressee( ad , false);
             }
         }
     }
     if ( foundEmpty ) {
         qDebug("postExternSync:%d empty addressees found:\n  probably filtered out by incoming sync filter.",foundEmpty  );
     }
         
 }
 
 bool   AddressBook::containsExternalUid( const QString& uid  )
 {
     Iterator it;
     for ( it = begin(); it != end(); ++it ) {
         if ( uid == (*it).externalUID( ) )
             return true;
     }
     return false;
 }