Many bugfixes

1 files changed, 1 insertions, 4 deletions

diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index fb7eb22..8213c2b 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -106,13 +106,13 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
   mFormattedNameEdit->setEnabled( type == CustomName );
   layout->addMultiCellWidget( mFormattedNameEdit, 5, 5, 1, 2 );
 
   mParseBox = new QCheckBox( i18n( "Parse name automatically" ), page );
   connect( mParseBox, SIGNAL( toggled(bool) ), SLOT( parseBoxChanged(bool) ) );
   connect( mParseBox, SIGNAL( toggled(bool) ), SLOT( modified() ) );
-  layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 );
+  layout->addMultiCellWidget( mParseBox, 6, 6, 0, 2 );
 
   // Fill in the values
   mFamilyNameEdit->setText( addr.familyName() );
   mGivenNameEdit->setText( addr.givenName() );
   mAdditionalNameEdit->setText( addr.additionalName() );
   mFormattedNameEdit->setText( addr.formattedName() );
@@ -172,15 +172,12 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
   connect( mFormattedNameCombo, SIGNAL( activated( int ) ), SLOT( modified() ) );
   connect( mFormattedNameEdit, SIGNAL( textChanged( const QString& ) ), SLOT( modified() ) );
 
   updateTypeCombo();
   mFormattedNameCombo->setCurrentItem( type );
 
-#ifdef KAB_EMBEDDED  
-  resize( KMIN(KGlobal::getDesktopWidth()-10, 490), KMIN(KGlobal::getDesktopHeight()-50, 300));
-#endif //KAB_EMBEDDED  
   
   mChanged = false;
 }
     
 NameEditDialog::~NameEditDialog() 
 {