formatted name fixes

1 files changed, 4 insertions, 2 deletions

diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 3397e06..c6993e9 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -981,11 +981,11 @@ void AddresseeEditorWidget::load()
   
   if ( mAddressee.formattedName().isEmpty() ) {
 //US    KConfig config( "kaddressbookrc" );
-    KConfig config( locateLocal("config", "kaddressbookrc") );
+    KConfig config( locateLocal("config", "kabcrc") );
     config.setGroup( "General" );
     mFormattedNameType = config.readNumEntry( "FormattedNameType", 1 );
     mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
-  } else {
+  } else {;
     if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::SimpleName ) )
       mFormattedNameType = NameEditDialog::SimpleName;
     else if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::FullName ) )
@@ -1185,6 +1185,8 @@ bool AddresseeEditorWidget::dirty()
 
 void AddresseeEditorWidget::nameTextChanged( const QString &text )
 {
+    if ( mBlockSignals )
+        return;
   // use the addressee class to parse the name for us
     mAConfig->setUid( mAddressee.uid() );
   if ( mAConfig->automaticNameParsing() ) {