summaryrefslogtreecommitdiffabout
path: root/kabc/addressee.cpp
Side-by-side diff
Diffstat (limited to 'kabc/addressee.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressee.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index fda62f1..e241281 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -96,5 +96,5 @@ Addressee::Addressee()
mData->resource = 0;
mData->mExternalId = ":";
- mData->revision = QDateTime ( QDate( 2004,1,1));
+ mData->revision = QDateTime ( QDate( 2003,1,1));
mData->mTempSyncStat = SYNC_TEMPSTATE_INITIAL;
}
@@ -309,4 +309,6 @@ void Addressee::mergeContact( const Addressee& ad )
// merging custom;
// merging keys
+ qDebug("merge contact %s ", ad.uid().latin1());
+ setUid( ad.uid() );
}
@@ -380,4 +382,5 @@ void Addressee::setOriginalExternalUID( const QString &id )
detach();
mData->empty = false;
+ qDebug("*******Set orig uid %s ", id.latin1());
mData->originalExternalUID = id;
}
@@ -392,4 +395,5 @@ void Addressee::setUid( const QString &id )
if ( id == mData->uid ) return;
detach();
+ qDebug("****setuid %s ", id.latin1());
mData->empty = false;
mData->uid = id;