5 files changed, 8 insertions, 41 deletions

diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index ff00a73..c456ae5 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -29,2 +29,6 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 
+        QLabel *spacer = new QLabel(toolbar);
+        spacer->setBackgroundMode(QWidget::PaletteButton);
+        toolbar->setStretchableWidget(spacer);
+
         sendmail = new QAction(tr("Send the mail"), QIconSet(Resource::loadPixmap("mail/sendmail")), 0, 0, this);
@@ -46,6 +50,2 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 
-        QLabel *spacer = new QLabel(toolbar);
-        spacer->setBackgroundMode(QWidget::PaletteButton);
-        toolbar->setStretchableWidget(spacer);
-
         abort = new QAction(tr("Abort sending"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this);
diff --git a/noncore/unsupported/mail2/configdiag.cpp b/noncore/unsupported/mail2/configdiag.cpp
index b89b937..e2b2f13 100644
--- a/noncore/unsupported/mail2/configdiag.cpp
+++ b/noncore/unsupported/mail2/configdiag.cpp
@@ -14,3 +14,2 @@
 #include "accounteditor.h"
-#include "zaurusstuff.h"
 #include "configdiag.h"
@@ -51,4 +50,2 @@ ConfigDiag::ConfigDiag(QWidget *parent, const char *name, bool modal, WFlags fl)
 
-        connect(testbutton, SIGNAL(clicked()), SLOT(slotTestSettings()));
-
         slotFillLists();
@@ -128,18 +125 @@ void ConfigDiag::slotDelAccount()
 
-void ConfigDiag::slotTestSettings()
-{
-        testbutton->setEnabled(false);
-
-        if (blinkLed->isChecked()) ZaurusStuff::blinkLedOn();
-        if (playSound->isChecked()) ZaurusStuff::buzzerOn();
-        QTimer::singleShot(3000, this, SLOT(slotEndTest()));
-}
-
-void ConfigDiag::slotEndTest()
-{
-        if (playSound->isChecked()) ZaurusStuff::buzzerOff();
-        if (blinkLed->isChecked()) ZaurusStuff::blinkLedOff();
-
-        testbutton->setEnabled(true);
-}
-
diff --git a/noncore/unsupported/mail2/configdiag.h b/noncore/unsupported/mail2/configdiag.h
index f70ba7f..cbc9b22 100644
--- a/noncore/unsupported/mail2/configdiag.h
+++ b/noncore/unsupported/mail2/configdiag.h
@@ -39,4 +39,2 @@ protected slots:
         void slotDelAccount();
-        void slotTestSettings();
-        void slotEndTest();
 
diff --git a/noncore/unsupported/mail2/configdiagbase.ui b/noncore/unsupported/mail2/configdiagbase.ui
index 182fedc..8b225fe 100644
--- a/noncore/unsupported/mail2/configdiagbase.ui
+++ b/noncore/unsupported/mail2/configdiagbase.ui
@@ -235,13 +235,2 @@
                                     </widget>
-                                    <widget row="2"  column="2" >
-                                        <class>QToolButton</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>testbutton</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>text</name>
-                                            <string> Test </string>
-                                        </property>
-                                    </widget>
                                     <widget row="0"  column="0"  rowspan="1"  colspan="3" >
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp
index 9ffe6f0..d61899b 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -32,2 +32,6 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
 
+        QLabel *spacer = new QLabel(toolbar);
+        spacer->setBackgroundMode(QWidget::PaletteButton);
+        toolbar->setStretchableWidget(spacer);
+
         compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
@@ -53,6 +57,2 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
 
-        QLabel *spacer = new QLabel(toolbar);
-        spacer->setBackgroundMode(QWidget::PaletteButton);
-        toolbar->setStretchableWidget(spacer);
-
         stop = new QAction(tr("Abort"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this);