2 files changed, 11 insertions, 3 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 15caf9e..fd5e4f9 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -6,12 +6,13 @@ KO/Pi:
 Fixed a problem displaying very long allday events in agenda view in single day mode.
 Fixed a problem with the default settings for new todos.
 
 KA/Pi:
 Added a config option to turn on asking before a contact is deleted.
 Fixed a problem with the default view and view selection at startup.
+Formatted name is now set on import, if formatted name is empty.
 
 ********** VERSION 2.2.0 ************
 
 New stable release!
 Fixed some minor usability problems.
 Added writing of next alarm to a file for usage on pdaXrom.
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 7cb67ed..405f7ec 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -56,12 +56,13 @@ extern "C"
 
 #include "kabcore.h"
 #include "undocmds.h"
 #include "xxportselectdialog.h"
 
 #include "xxportmanager.h"
+#include "nameeditdialog.h"
 
 KURL XXPortManager::importURL = KURL();
 QString XXPortManager::importData = QString::null;
 
 class PreviewDialog : public KDialogBase
 {
@@ -129,38 +130,44 @@ void XXPortManager::slotImport( const QString &identifier, const QString &data )
   useUndo = true;
 #endif  
   mShowPreview = true;
   KABC::AddresseeList::Iterator it;
   bool imported = false;
   int count = 0;
+  
+  KConfig config( locateLocal("config", "kabcrc") );
+  config.setGroup( "General" );
+  int FormattedNameType = config.readNumEntry( "FormattedNameType", 1 );
+
+
   for ( it = list.begin(); it != list.end(); ++it ) {
     if ( mShowPreview ) {
       PreviewDialog dlg( *it, mCore );
       connect( &dlg, SIGNAL( closeClicked() ), this, SLOT ( noPreview()) );
       if ( !dlg.exec() ) {
           if ( mShowPreview )
               continue;
       }
     }
-
     (*it).setResource( resource );
+    if ( (*it).formattedName().isEmpty() )
+        (*it).setFormattedName( NameEditDialog::formattedName( (*it), FormattedNameType ) );
     if ( useUndo ) {
+        ++count; 
         // We use a PwNewCommand so the user can undo it.
         PwNewCommand *command = new PwNewCommand( mCore->addressBook(), *it );
         UndoStack::instance()->push( command );
         RedoStack::instance()->clear();
     } else {
         ++count;
         mCore->addressBook()->insertAddressee( (*it), true, true );
     }
     imported = true;
   }
-
   if ( imported ) {
       KMessageBox::information( mCore, i18n( "%1 contacts\nsuccessfully\nimported.").arg( count) );
-
     emit modified();
   }
 }
 void XXPortManager::noPreview()
 {
     mShowPreview = false;