3 files changed, 3 insertions, 1 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 31ce1d6..25c77f6 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -309,12 +309,13 @@ void Addressee::mergeContact( const Addressee& ad )
     // merging emails;
     // merging categories;
     // merging custom;
     // merging keys
     qDebug("merge contact %s ", ad.uid().latin1());
     setUid( ad.uid() );
+    setRevision( ad.revision() );
 }
 
 void Addressee::removeID(const QString &prof)
 {
     detach();
     mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof);
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index 437bda8..adc7256 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -295,13 +295,12 @@ bool ResourceSharpDTM::save( Ticket *ticket )
                   }
           }
       }
 
   }
   AddresseeMap::Iterator itam;
-  res;
   for ( res=mAccess->first(); res == true; res=mAccess->next())
       {
           id = mAccess->cardId();
           int idint = id;
           itam = map.find( idint );
           if ( itam != map.end() ) {
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index fccf625..d36df20 100644
--- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
@@ -309,12 +309,13 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
     database->writeField(ZdbAdrs::DefaultEmail, addr.preferredEmail() );
 
 
     // home
     const Address homeaddress = addr.address(Address::Home);
     if (!homeaddress.isEmpty()) {
+        qDebug("write home address ");
       database->writeField(ZdbAdrs::HomeStreet, homeaddress.street());
       database->writeField(ZdbAdrs::HomeCity, homeaddress.locality());
       database->writeField(ZdbAdrs::HomeState, homeaddress.region());
       database->writeField(ZdbAdrs::HomeZip, homeaddress.postalCode());
       database->writeField(ZdbAdrs::HomeCountry, homeaddress.country());
     }
@@ -336,12 +337,13 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
     database->writeField(ZdbAdrs::HomeWebPage, addr.url().url());
 
 
     // business
     const Address businessaddress = addr.address(Address::Work);
     if (!businessaddress.isEmpty()) {
+        qDebug("write business address ");
       database->writeField(ZdbAdrs::BusinessStreet, businessaddress.street());
       database->writeField(ZdbAdrs::BusinessCity, businessaddress.locality());
       database->writeField(ZdbAdrs::BusinessState, businessaddress.region());
       database->writeField(ZdbAdrs::BusinessZip, businessaddress.postalCode());
       database->writeField(ZdbAdrs::BusinessCountry, businessaddress.country());
     }