kapi trans

1 files changed, 2 insertions, 2 deletions

diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index 8165b4c..95e16b6 100644
--- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
@@ -72,25 +72,25 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
 {
 	SlZDataBase* db = (SlZDataBase*)database;
 
     // for syncing: we need setting of the two fields
     addr.setExternalUID( QString::number( contact ) );
     addr.setOriginalExternalUID( QString::number( contact ) ); 
     addr.setTempSyncStat(  SYNC_TEMPSTATE_NEW_EXTERNAL );
 
 
     // name
     //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!");
     addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); 
-    addr.setName(db->readField(ZdbAdrs::FullName));
+    //addr.setName(db->readField(ZdbAdrs::FullName));
 
     addr.setFamilyName( db->readField(ZdbAdrs::LastName) );
     addr.setGivenName( db->readField(ZdbAdrs::FirstName) );
     addr.setAdditionalName( db->readField(ZdbAdrs::MiddleName) );
     addr.setPrefix( db->readField(ZdbAdrs::Title) );
     addr.setSuffix( db->readField(ZdbAdrs::Suffix) );
 
 
     QString emailstr = db->readField(ZdbAdrs::Emails);
     emailstr.replace( QRegExp(","), " " ); 
     emailstr.replace( QRegExp(";"), " " ); 
     emailstr.replace( QRegExp(":"), " " ); 
@@ -293,25 +293,25 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
     QString formattedName = addr.formattedName();
     if ( formattedName.isEmpty() ) {
         if ( !addr.familyName().isEmpty() ) {
             formattedName = addr.familyName();
             if ( !addr.givenName().isEmpty() ) {
                 formattedName += ", ";
                 formattedName += addr.givenName();
             }
         } else
             formattedName = addr.givenName();
     }
     database->writeField(ZdbAdrs::FileAs, formattedName);
-    database->writeField(ZdbAdrs::FullName, addr.name());
+    database->writeField(ZdbAdrs::FullName, formattedName);
 
     // email
     //qDebug("SharpDTMConverter::addresseeToSharp check which seperator we need here for the emails!!");
     //qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee");
     QString emails = addr.emails().join(" ");
     database->writeField(ZdbAdrs::Emails, emails );
 
     database->writeField(ZdbAdrs::DefaultEmail, addr.preferredEmail() );
     // home
     const Address homeaddress = addr.address(Address::Home);
     database->writeField(ZdbAdrs::HomeStreet, homeaddress.street());
     database->writeField(ZdbAdrs::HomeCity, homeaddress.locality());