4 files changed, 14 insertions, 16 deletions

diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index cf4cbe8..2a74286 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -11,7 +11,6 @@
 
 #include "defines.h"
 #include "mainwindow.h"
-#include "settingsdialog.h"
 #include "viewmail.h"
 #include "mailtypes.h"
 #include "mailistviewitem.h"
@@ -80,7 +79,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     editSettings->addTo( settingsMenu );
     connect( editSettings, SIGNAL( activated() ),
              SLOT( slotEditSettings() ) );
-
     editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS,
                                 0, 0, this );
     editAccounts->addTo( settingsMenu );
@@ -157,10 +155,8 @@ void MainWindow::slotAdjustColumns()
     mailView->setColumnWidth( 4, 50 );
 }
 
-void MainWindow::slotEditSettings() {
-    SettingsDialog settingsDialog( this,  0, true );
-    settingsDialog.showMaximized();
-    settingsDialog.exec();
+void MainWindow::slotEditSettings()
+{
 }
 
 void MainWindow::slotShowFolders( bool show )
diff --git a/noncore/net/mail/mainwindow.h b/noncore/net/mail/mainwindow.h
index 638232a..0e077f6 100644
--- a/noncore/net/mail/mainwindow.h
+++ b/noncore/net/mail/mainwindow.h
@@ -21,7 +21,7 @@ public:
     MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
 
 public slots:
-    void slotAdjustColumns();
+    virtual void slotAdjustColumns();
     
 protected slots:
     virtual void slotShowFolders( bool show );
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 2909893..e35f5b6 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -1,4 +1,5 @@
 #include <qmessagebox.h>
+#include "settingsdialog.h"
 #include "opiemail.h"
 #include "editaccounts.h"
 #include "composemail.h"
@@ -17,7 +18,6 @@ OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
     connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
     connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
 //    connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
-    connect( editSettings, SIGNAL( activated() ), SLOT( slotEditSettings() ) );
     connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
     // Added by Stefan Eilers to allow starting by addressbook..
     // copied from old mail2
@@ -92,7 +92,9 @@ void OpieMail::slotSearchMails()
 
 void OpieMail::slotEditSettings()
 {
-    qDebug( "Edit Settings" );
+    SettingsDialog settingsDialog( this,  0, true );
+    settingsDialog.showMaximized();
+    settingsDialog.exec();
 }
 
 void OpieMail::slotEditAccounts()
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h
index 8cbcaa4..4e3c974 100644
--- a/noncore/net/mail/opiemail.h
+++ b/noncore/net/mail/opiemail.h
@@ -13,14 +13,14 @@ public:
     static QString appName() { return QString::fromLatin1("opiemail"); }
 
 public slots:
-    void slotwriteMail(const QString&name,const QString&email);
-    void slotComposeMail();
-    void appMessage(const QCString &msg, const QByteArray &data);
+    virtual void slotwriteMail(const QString&name,const QString&email);
+    virtual void slotComposeMail();
+    virtual void appMessage(const QCString &msg, const QByteArray &data);
 protected slots:
-    void slotSendQueued();
-    void slotSearchMails();
-    void slotEditSettings();
-    void slotEditAccounts();
+    virtual void slotSendQueued();
+    virtual void slotSearchMails();
+    virtual void slotEditSettings();
+    virtual void slotEditAccounts();
 private:
     Settings *settings;