| -rw-r--r-- | noncore/unsupported/mail2/attachdiag.cpp | 4 | ||||
| -rw-r--r-- | noncore/unsupported/mail2/attachdiag.h | 2 | ||||
| -rw-r--r-- | noncore/unsupported/mail2/composer.cpp | 2 | ||||
| -rw-r--r-- | noncore/unsupported/mail2/libmail/mailfactory.cpp | 4 |
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 @@ -56,7 +56,7 @@ void AttachDiag::fileSelected(const DocLnk &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(); 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 @@ -11,5 +11,5 @@ class AttachDiag : public QDialog public: - static DocLnk getFile(); + static DocLnk getFile(QWidget *parent); protected: 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 @@ -200,5 +200,5 @@ void Composer::slotOpenAddressPicker() void Composer::slotAddAttach() { - DocLnk lnk = AttachDiag::getFile(); + DocLnk lnk = AttachDiag::getFile(this); if (lnk.name().isEmpty()) return; 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 @@ -102,7 +102,7 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent) } 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; } } |