BUGFIX: 0001325 - no double dialog start in odict, when using QDialog::exec don't use it together with QPEApplication::execDialog() but with QPEApplication::showDialog(), also fixed another bug where shadow entries where created after deletion of entries

2 files changed, 11 insertions, 8 deletions

diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp
index 7fa6008..3d98f63 100644
--- a/noncore/apps/odict/configdlg.cpp
+++ b/noncore/apps/odict/configdlg.cpp
@@ -39,3 +39,3 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
         loadSearchMethodNames();
-        
+
         QVBox *vbox = new QVBox( hbox );
@@ -47,3 +47,3 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
         connect( delete_button, SIGNAL( clicked() ), this, SLOT( slotDeleteMethod() ));
-        
+
         vbox_layout_searchtab->addWidget( hbox );
@@ -52,3 +52,3 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
 
-        QPEApplication::execDialog( this );
+         QPEApplication::showDialog( this );
 }
@@ -88,3 +88,3 @@ void ConfigDlg::slotDeleteMethod()
                 //FIXME: this only removes the entries but not the group itself
-                
+
                 list->takeItem( list->selectedItem() );
@@ -99,5 +99,8 @@ void ConfigDlg::loadSearchMethodNames()
         {
-                QListViewItem *item = new QListViewItem( list );
                 cfg.setGroup( *it );
-                item->setText( 0 , cfg.readEntry( "Name" ) );
+                QString name = cfg.readEntry( "Name" );
+                if ( name != QString::null ) {
+                        QListViewItem *item = new QListViewItem( list );
+                        item->setText( 0 , name );
+                }
         }
diff --git a/noncore/apps/odict/searchmethoddlg.cpp b/noncore/apps/odict/searchmethoddlg.cpp
index 34e8b16..0425657 100644
--- a/noncore/apps/odict/searchmethoddlg.cpp
+++ b/noncore/apps/odict/searchmethoddlg.cpp
@@ -68,4 +68,2 @@ SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal,
 
-        QPEApplication::execDialog ( this );
-
         if( !itemname )
@@ -78,2 +76,4 @@ SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal,
         }
+
+         QPEApplication::showDialog ( this );
 }