6 files changed, 88 insertions, 26 deletions

diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp
index 82ed117..7f65dba 100644
--- a/noncore/unsupported/mail2/composer.cpp
+++ b/noncore/unsupported/mail2/composer.cpp
@@ -3,12 +3,13 @@
 #include <qpopupmenu.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qaction.h>
 #include <qtimer.h>
 #include <qlabel.h>
+#include <qapplication.h>
 
 #include <qpe/resource.h>
 
 #include "addresspicker.h"
 #include "listviewplus.h"
 #include "smtphandler.h"
@@ -22,13 +23,13 @@ AttachViewItem::AttachViewItem(QListView *parent, Attachment &attachment)
         setPixmap(0, _attachment.docLnk()->pixmap().isNull() ? Resource::loadPixmap("UnknownDocument-14") : _attachment.docLnk()->pixmap());
         setText(0, _attachment.newName().isEmpty() ? _attachment.fileName() : _attachment.newName());
         setText(1, _attachment.description());
 }
 
 Composer::Composer(QWidget *parent, const char *name, WFlags fl)
-        : ComposerBase(parent, name, fl)
+        : ComposerBase(parent, name, fl), _inLoop(false)
 {
         abort->setEnabled(false);
         to->setFocus();
 
         connect(sendmail, SIGNAL(activated()), SLOT(slotSendMail()));
         connect(addressbook, SIGNAL(activated()), SLOT(slotOpenAddressPicker()));
@@ -40,12 +41,37 @@ Composer::Composer(QWidget *parent, const char *name, WFlags fl)
         connect(attachPopup, SIGNAL(activated(int)), SLOT(slotPopupHandler(int)));
 
         QTimer::singleShot(0, this, SLOT(slotFillStuff()));
         QTimer::singleShot(0, this, SLOT(slotResizing()));
 }
 
+Composer::~Composer()
+{
+        hide();
+}
+
+void Composer::hide()
+{
+        QWidget::hide();
+
+        if (_inLoop) {
+                _inLoop = false;
+                qApp->exit_loop();
+        }
+}
+
+void Composer::exec()
+{
+        show();
+
+        if (!_inLoop) {
+                _inLoop = true;
+                qApp->enter_loop();
+        }
+}
+
 void Composer::setSendMail(SendMail &sendMail)
 {
         to->setText(sendMail.to());
         cc->setText(sendMail.cc());
         bcc->setText(sendMail.bcc());
         subject->setText(sendMail.subject());
diff --git a/noncore/unsupported/mail2/composer.h b/noncore/unsupported/mail2/composer.h
index a1af121..2640d7e 100644
--- a/noncore/unsupported/mail2/composer.h
+++ b/noncore/unsupported/mail2/composer.h
@@ -23,12 +23,16 @@ private:
 class Composer : public ComposerBase
 {
         Q_OBJECT
 
 public:
         Composer(QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal);
+        ~Composer();
+
+        void hide();
+        void exec();
 
         void setSendMail(SendMail &sendMail);
 
 protected slots:
         void slotPopupHandler(int itemid);
         void slotSendMail();
@@ -42,11 +46,12 @@ protected slots:
         void slotDelAttach();
 
 protected:
         QValueList<Account> accountsLoaded;
 
 private:
+        bool _inLoop;
         QString _inReplyTo;
 
 };
 
 #endif
diff --git a/noncore/unsupported/mail2/mainwindow.cpp b/noncore/unsupported/mail2/mainwindow.cpp
index 4d15e23..2230dc0 100644
--- a/noncore/unsupported/mail2/mainwindow.cpp
+++ b/noncore/unsupported/mail2/mainwindow.cpp
@@ -33,33 +33,33 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl)
         connect(findmails, SIGNAL(activated()), SLOT(slotSearch()));
         connect(configure, SIGNAL(activated()), SLOT(slotConfigure()));
 }
 
 void MainWindow::slotCompose()
 {
-        Composer *composer = new Composer();
-        composer->showMaximized();
-        composer->show();
+        Composer composer(this, 0, true);
+        composer.showMaximized();
+        composer.exec();
 }
 
 void MainWindow::slotSearch()
 {
-        SearchDiag *searchDiag = new SearchDiag(this, 0, true);
-        searchDiag->showMaximized();
-        searchDiag->show();
+        SearchDiag searchDiag(this, 0, true);
+        searchDiag.showMaximized();
+        searchDiag.exec();
 }
 
 void MainWindow::slotConfigure()
 {
-        ConfigDiag *configDiag = new ConfigDiag(this, 0, true);
-        configDiag->showMaximized();
-        configDiag->show();
+        ConfigDiag configDiag(this, 0, true);
+        configDiag.showMaximized();
+        configDiag.exec();
 
-        connect(configDiag, SIGNAL(changed()), folderView, SLOT(update()));
+        connect(&configDiag, SIGNAL(changed()), folderView, SLOT(update()));
 }
 
 void MainWindow::mailClicked(IMAPResponseFETCH mail, IMAPHandler *handler)
 {
-        ViewMail *viewMail = new ViewMail(mail, handler);
-        viewMail->showMaximized();
-        viewMail->show();
+        ViewMail viewMail(mail, handler, this, 0, true);
+        viewMail.showMaximized();
+        viewMail.exec();
 }
diff --git a/noncore/unsupported/mail2/searchdiag.cpp b/noncore/unsupported/mail2/searchdiag.cpp
index 33b8afb..907f6ff 100644
--- a/noncore/unsupported/mail2/searchdiag.cpp
+++ b/noncore/unsupported/mail2/searchdiag.cpp
@@ -109,15 +109,15 @@ void SearchDiag::slotIMAPFetch(IMAPResponse &response)
                 QMessageBox::warning(this, tr("Error"), tr("<p>Couldn't fetch the mail headers. (Server said: %1)").arg(response.statusResponse().comment()));
         }
 }
 
 void SearchDiag::slotMailClicked(IMAPResponseFETCH fetch, IMAPHandler *)
 {
-        ViewMail *viewMail = new ViewMail(fetch, _folder.topFolder().handler());
-        viewMail->showMaximized();
-        viewMail->show();
+        ViewMail viewMail(fetch, _folder.topFolder().handler(), this, 0, true);
+        viewMail.showMaximized();
+        viewMail.exec();
 }
 
 void SearchDiag::slotInItemActivated(int index)
 {
         if (index == INMENU_HEADERF) {
                 other->setEnabled(true);
diff --git a/noncore/unsupported/mail2/viewmail.cpp b/noncore/unsupported/mail2/viewmail.cpp
index ae1f5f3..3c88d99 100644
--- a/noncore/unsupported/mail2/viewmail.cpp
+++ b/noncore/unsupported/mail2/viewmail.cpp
@@ -1,9 +1,10 @@
 #include <qtextbrowser.h>
 #include <qmessagebox.h>
 #include <qaction.h>
+#include <qapplication.h>
 
 #include "mailfactory.h"
 #include "composer.h"
 #include "viewmail.h"
 
 AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore)
@@ -20,13 +21,13 @@ AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore)
         setText(0, _attachItemStore.mimeType());
         setText(1, _attachItemStore.fileName());
         setText(2, _attachItemStore.description());
 }
 
 ViewMail::ViewMail(IMAPResponseFETCH &mail, IMAPHandler *handler, QWidget *parent, const char *name, WFlags fl)
-        : ViewMailBase(parent, name, fl), _mail(mail), _handler(handler)
+        : ViewMailBase(parent, name, fl), _inLoop(false), _mail(mail), _handler(handler)
 {
         setCaption(caption().arg(mail.envelope().from()[0].name()));
 
         _gotBody = false;
         _mailHtml = tr(
                 "<html><body>"
@@ -58,12 +59,37 @@ ViewMail::ViewMail(IMAPResponseFETCH &mail, IMAPHandler *handler, QWidget *paren
         browser->setText(QString(_mailHtml).arg(tr("Getting mail body from server. Please wait...")));
 
         _handler->iUid("FETCH", QString("%1 (BODY[1])").arg(mail.uid()));
         connect(_handler, SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPUid(IMAPResponse &)));
 }
 
+ViewMail::~ViewMail()
+{
+        hide();
+}
+
+void ViewMail::hide()
+{
+        QWidget::hide();
+
+        if (_inLoop) {
+                _inLoop = false;
+                qApp->exit_loop();
+        }
+}
+
+void ViewMail::exec()
+{
+        show();
+
+        if (!_inLoop) {
+                _inLoop = true;
+                qApp->enter_loop();
+        }
+}
+
 QString ViewMail::deHtml(const QString &string)
 {
         QString string_ = string;
         string_.replace(QRegExp("&"), "&amp;");
         string_.replace(QRegExp("<"), "&lt;");
         string_.replace(QRegExp(">"), "&gt;");
@@ -98,16 +124,16 @@ void ViewMail::slotReply()
         SendMail sendMail;
         sendMail.setTo(_mail.envelope().from()[0].toString());
         sendMail.setSubject(prefix + _mail.envelope().subject());
         sendMail.setInReplyTo(_mail.envelope().messageId());
         sendMail.setMessage(rtext);
 
-        Composer *composer = new Composer(0, 0, Qt::WType_Modal);
-        composer->setSendMail(sendMail);
-        composer->showMaximized();
-        composer->show();
+        Composer composer(this, 0, true);
+        composer.setSendMail(sendMail);
+        composer.showMaximized();
+        composer.exec();
 }
 
 void ViewMail::slotForward()
 {
         if (!_gotBody) {
                 QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
@@ -142,16 +168,16 @@ void ViewMail::slotForward()
         ftext += QString("----- End forwarded message -----\n");
 
         SendMail sendMail;
         sendMail.setSubject("Fwd: " + _mail.envelope().subject());
         sendMail.setMessage(ftext);
 
-        Composer *composer = new Composer(0, 0, Qt::WType_Modal);
-        composer->setSendMail(sendMail);
-        composer->showMaximized();
-        composer->show();
+        Composer composer(this, 0, true);
+        composer.setSendMail(sendMail);
+        composer.showMaximized();
+        composer.exec();
 }
 
 void ViewMail::slotIMAPUid(IMAPResponse &response)
 {
         disconnect(_handler, SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPUid(IMAPResponse &)));
 
diff --git a/noncore/unsupported/mail2/viewmail.h b/noncore/unsupported/mail2/viewmail.h
index a013e43..efc2300 100644
--- a/noncore/unsupported/mail2/viewmail.h
+++ b/noncore/unsupported/mail2/viewmail.h
@@ -40,24 +40,29 @@ private:
 class ViewMail : public ViewMailBase
 {
         Q_OBJECT
 
 public:
         ViewMail(IMAPResponseFETCH &mail, IMAPHandler *handler, QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal);
+        ~ViewMail();
+
+        void hide();
+        void exec();
 
 protected:
         //void fillList(IMAPResponseBODYSTRUCTURE &structure);
         QString deHtml(const QString &string);
 
 protected slots:
         void slotReply();
         void slotForward();
 
         void slotIMAPUid(IMAPResponse &response);
 
 private:
+        bool _inLoop;
         IMAPResponseFETCH _mail;
         IMAPHandler *_handler;
         QString _mailHtml;
         bool _gotBody;
 
 };