Some finetuning to behave like the previous release if just one first and

lastname is used..

1 files changed, 6 insertions, 3 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 7bc5bde..c4a7b10 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -1025,12 +1025,12 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 	int index = cmbFileAs->currentItem();
 
 	cmbFileAs->clear();
 
-	cmbFileAs->insertItem( parseName( textChanged, NAME_FL ) );
-	cmbFileAs->insertItem( parseName( textChanged, NAME_FMLS ) );
 	cmbFileAs->insertItem( parseName( textChanged, NAME_LF ) );
 	cmbFileAs->insertItem( parseName( textChanged, NAME_LFM ) );
+	cmbFileAs->insertItem( parseName( textChanged, NAME_FL ) );
+	cmbFileAs->insertItem( parseName( textChanged, NAME_FMLS ) );
 
 	cmbFileAs->setCurrentItem( index );
 
 	useFullName = true;
@@ -1151,11 +1151,14 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 			allSecondNames.append( *it );
 		
 		strMiddleName = allSecondNames.join(" ");
 		strLastName = *(--allNames.end());
-
+		
 	}
 
+	if ( strFirstName == strLastName )
+		strFirstName = "";
+
 	qWarning(" strFirstName: %s",  strFirstName.latin1());
 	qWarning(" strMiddleName: %s",  strMiddleName.latin1());
 	qWarning(" strLastName: %s",  strLastName.latin1());
 	qWarning(" strSuffix: %s",  strSuffix.latin1());