2 files changed, 16 insertions, 24 deletions

diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index 733db17..8b02f9f 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -845,13 +845,9 @@ bool Gutenbrowser::load( const char *fileName) {
 } // end load
 
 void Gutenbrowser::Search() {
-
-			//    if( searchDlg->isHidden())
-		{
 				odebug << "Starting search dialog" << oendl;
 				searchDlg = new SearchDialog( this, "Etext Search", true);
 				searchDlg->setCaption( tr( "Etext Search" ));
-					//        searchDlg->setLabel( "- searches etext");
 				connect( searchDlg,SIGNAL( search_signal()),this,SLOT( search_slot()));
 				connect( searchDlg,SIGNAL( search_done_signal()),this,SLOT( searchdone_slot()));
 
@@ -859,8 +855,6 @@ void Gutenbrowser::Search() {
 				QString string = searchDlg->searchString;
 				Lview->deselect();
 				searchDlg->show();
-				searchDlg->result();
-		}
 }
 
 void Gutenbrowser::search_slot( ) {
diff --git a/noncore/apps/opie-gutenbrowser/helpwindow.cpp b/noncore/apps/opie-gutenbrowser/helpwindow.cpp
index 4bdac02..f444a2e 100644
--- a/noncore/apps/opie-gutenbrowser/helpwindow.cpp
+++ b/noncore/apps/opie-gutenbrowser/helpwindow.cpp
@@ -196,10 +196,11 @@ HelpWindow::~HelpWindow()
   history.append( *it );
 
     QFile f( QDir::currentDirPath() + "/.history" );
-    f.open( IO_WriteOnly );
+    if ( f.open( IO_WriteOnly ) ) {
     QDataStream s( &f );
     s << history;
     f.close();
+    }
 
     bookmarks.clear();
     QMap<int, QString>::Iterator it2 = mBookmarks.begin();
@@ -207,22 +208,14 @@ HelpWindow::~HelpWindow()
   bookmarks.append( *it2 );
 
     QFile f2( QDir::currentDirPath() + "/.bookmarks" );
-    f2.open( IO_WriteOnly );
+    if ( !f2.open( IO_WriteOnly ) )
+	return;
+
     QDataStream s2( &f2 );
     s2 << bookmarks;
     f2.close();
 }
 
-//  void HelpWindow::about()
-//  {
-//      QMessageBox::about( this, "Gutenbrowser", "<p>Thanks to Trolltech for this</p>" );
-//  }
-
-//  void HelpWindow::aboutQt()
-//  {
-//      QMessageBox::aboutQt( this, "QBrowser" );
-//  }
-
 void HelpWindow::openFile()
 {
 #ifndef QT_NO_FILEDIALOG
@@ -292,27 +285,32 @@ void HelpWindow::pathSelected( const QString &_path )
 
 void HelpWindow::readHistory()
 {
-    if ( QFile::exists( QDir::currentDirPath() + "/.history" ) ) {
+    if ( !QFile::exists( QDir::currentDirPath() + "/.history" ) )
+	return;
+
   QFile f( QDir::currentDirPath() + "/.history" );
-  f.open( IO_ReadOnly );
+    if ( !f.open( IO_ReadOnly ) )
+	return;
+
   QDataStream s( &f );
   s >> history;
   f.close();
   while ( history.count() > 20 )
       history.remove( history.begin() );
     }
-}
 
 void HelpWindow::readBookmarks()
 {
-    if ( QFile::exists( QDir::currentDirPath() + "/.bookmarks" ) ) {
+    if ( !QFile::exists( QDir::currentDirPath() + "/.bookmarks" ) )
+	return;
+
   QFile f( QDir::currentDirPath() + "/.bookmarks" );
-  f.open( IO_ReadOnly );
+    if ( !f.open( IO_ReadOnly ) )
+        return;
   QDataStream s( &f );
   s >> bookmarks;
   f.close();
     }
-}
 
 void HelpWindow::histChosen( int i )
 {