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

lastname is used..

1 files changed, 5 insertions, 2 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
@@ -1026,10 +1026,10 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 
 	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 );
 
@@ -1155,6 +1155,9 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 
 	}
 
+	if ( strFirstName == strLastName )
+		strFirstName = "";
+
 	qWarning(" strFirstName: %s",  strFirstName.latin1());
 	qWarning(" strMiddleName: %s",  strMiddleName.latin1());
 	qWarning(" strLastName: %s",  strLastName.latin1());