| author | zautrix <zautrix> | 2005-01-14 19:02:53 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-01-14 19:02:53 (UTC) |
| commit | 620f8de219ee34c209960f02c8296c0568dd5d8b (patch) (side-by-side diff) | |
| tree | 772170b3b9ceaf8c204e2bdd9cbb333427de30cd /kaddressbook/addresseeeditorwidget.cpp | |
| parent | 61c95ce0295f1397db6499c5b468a9fb3d32a0f4 (diff) | |
| download | kdepimpi-620f8de219ee34c209960f02c8296c0568dd5d8b.zip kdepimpi-620f8de219ee34c209960f02c8296c0568dd5d8b.tar.gz kdepimpi-620f8de219ee34c209960f02c8296c0568dd5d8b.tar.bz2 | |
formatted name fixes
Diffstat (limited to 'kaddressbook/addresseeeditorwidget.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | kaddressbook/addresseeeditorwidget.cpp | 6 |
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() ) { |