summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressee.cpp1
-rw-r--r--kabc/plugins/sharpdtm/resourcesharpdtm.cpp1
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmconverter.cpp2
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
@@ -314,2 +314,3 @@ void Addressee::mergeContact( const Addressee& ad )
setUid( ad.uid() );
+ setRevision( ad.revision() );
}
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
@@ -300,3 +300,2 @@ bool ResourceSharpDTM::save( Ticket *ticket )
AddresseeMap::Iterator itam;
- res;
for ( res=mAccess->first(); res == true; res=mAccess->next())
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
@@ -314,2 +314,3 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
if (!homeaddress.isEmpty()) {
+ qDebug("write home address ");
database->writeField(ZdbAdrs::HomeStreet, homeaddress.street());
@@ -341,2 +342,3 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
if (!businessaddress.isEmpty()) {
+ qDebug("write business address ");
database->writeField(ZdbAdrs::BusinessStreet, businessaddress.street());