Minor fixes

4 files changed, 6 insertions, 6 deletions

diff --git a/noncore/unsupported/mail2/attachdiag.cpp b/noncore/unsupported/mail2/attachdiag.cpp
index 6e6c3d4..bedf3c4 100644
--- a/noncore/unsupported/mail2/attachdiag.cpp
+++ b/noncore/unsupported/mail2/attachdiag.cpp
@@ -54,11 +54,11 @@ void AttachDiag::fileSelected(const DocLnk &file)
 {
         currentFile = file;
 }
 
-DocLnk AttachDiag::getFile()
+DocLnk AttachDiag::getFile(QWidget *parent)
 {
-        AttachDiag *attach = new AttachDiag(0, 0, true);
+        AttachDiag *attach = new AttachDiag(parent, 0, true);
         attach->showMaximized();
         attach->show();
 
         if (QDialog::Accepted == attach->exec()) {
diff --git a/noncore/unsupported/mail2/attachdiag.h b/noncore/unsupported/mail2/attachdiag.h
index c673cfc..bce5b4b 100644
--- a/noncore/unsupported/mail2/attachdiag.h
+++ b/noncore/unsupported/mail2/attachdiag.h
@@ -9,9 +9,9 @@ class AttachDiag : public QDialog
 {
         Q_OBJECT
 
 public:
-        static DocLnk getFile();
+        static DocLnk getFile(QWidget *parent);
 
 protected:
         AttachDiag(QWidget *parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0);
 
diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp
index 57f0779..82ed117 100644
--- a/noncore/unsupported/mail2/composer.cpp
+++ b/noncore/unsupported/mail2/composer.cpp
@@ -198,9 +198,9 @@ void Composer::slotOpenAddressPicker()
 }
 
 void Composer::slotAddAttach()
 {
-        DocLnk lnk = AttachDiag::getFile();
+        DocLnk lnk = AttachDiag::getFile(this);
         if (lnk.name().isEmpty()) return;
 
         Attachment attachment;
         attachment.setFileName(lnk.file());
diff --git a/noncore/unsupported/mail2/libmail/mailfactory.cpp b/noncore/unsupported/mail2/libmail/mailfactory.cpp
index 427e72c..6602919 100644
--- a/noncore/unsupported/mail2/libmail/mailfactory.cpp
+++ b/noncore/unsupported/mail2/libmail/mailfactory.cpp
@@ -100,11 +100,11 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent)
 
                                 _body += "\n" + MiscFunctions::encodeBase64(file) + "\n";
                         } else {
                                 int ret = QMessageBox::critical(_parent, tr("Error"), tr("<p>Couldn't attach file '%1'. Continue anyway or abort?</p>").arg((*it).fileName()), tr("Continue"), tr("Abort"));
-                                if (ret == 1) {
-                                        it = attachments.end();
+                                if (ret != 0) {
                                         _abort = true;
+                                        break;
                                 }
                         }
                 }
                 _body += "\n--" + boundary + "--";