From ba89a5d20eb054054d9cfae3723a4d62b9f62efd Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Tue, 21 Sep 2004 11:17:18 +0000
Subject: DTM fix

---
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 31ce1d6..25c77f6 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -312,6 +312,7 @@ void Addressee::mergeContact( const Addressee& ad )
     // merging keys
     qDebug("merge contact %s ", ad.uid().latin1());
     setUid( ad.uid() );
+    setRevision( ad.revision() );
 }
 
 void Addressee::removeID(const QString &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
@@ -298,7 +298,6 @@ bool ResourceSharpDTM::save( Ticket *ticket )
 
   }
   AddresseeMap::Iterator itam;
-  res;
   for ( res=mAccess->first(); res == true; res=mAccess->next())
       {
           id = mAccess->cardId();
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
@@ -312,6 +312,7 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
     // 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());
@@ -339,6 +340,7 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
     // 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());
--
cgit v0.9.0.2