-rw-r--r-- | noncore/unsupported/mail2/composer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp index 03d50b6..57f0779 100644 --- a/noncore/unsupported/mail2/composer.cpp +++ b/noncore/unsupported/mail2/composer.cpp | |||
@@ -99,48 +99,49 @@ void Composer::slotSendMail() | |||
99 | smail.setBcc(bcc->text()); | 99 | smail.setBcc(bcc->text()); |
100 | smail.setSubject(subject->text()); | 100 | smail.setSubject(subject->text()); |
101 | smail.setMessage(message->text()); | 101 | smail.setMessage(message->text()); |
102 | smail.setNeedsMime(attachView->childCount() == 0 ? false : true); | 102 | smail.setNeedsMime(attachView->childCount() == 0 ? false : true); |
103 | smail.setAccount(accountsLoaded[from->currentItem()]); | 103 | smail.setAccount(accountsLoaded[from->currentItem()]); |
104 | 104 | ||
105 | if (priority->currentItem() == POPUP_PRIO_LOW) { | 105 | if (priority->currentItem() == POPUP_PRIO_LOW) { |
106 | smail.setPriority("Low");// No i18n on purpose | 106 | smail.setPriority("Low");// No i18n on purpose |
107 | } else if (priority->currentItem() == POPUP_PRIO_NORMAL) { | 107 | } else if (priority->currentItem() == POPUP_PRIO_NORMAL) { |
108 | smail.setPriority("Normal");// No i18n on purpose | 108 | smail.setPriority("Normal");// No i18n on purpose |
109 | } else if (priority->currentItem() == POPUP_PRIO_HIGH) { | 109 | } else if (priority->currentItem() == POPUP_PRIO_HIGH) { |
110 | smail.setPriority("High");// No i18n on purpose | 110 | smail.setPriority("High");// No i18n on purpose |
111 | } | 111 | } |
112 | 112 | ||
113 | QValueList<Attachment> attachments; | 113 | QValueList<Attachment> attachments; |
114 | QListViewItem *item; | 114 | QListViewItem *item; |
115 | for (item = attachView->firstChild(); item != 0; item = item->itemBelow()) { | 115 | for (item = attachView->firstChild(); item != 0; item = item->itemBelow()) { |
116 | attachments.append(((AttachViewItem *)item)->attachment()); | 116 | attachments.append(((AttachViewItem *)item)->attachment()); |
117 | } | 117 | } |
118 | 118 | ||
119 | smail.setAttachments(attachments); | 119 | smail.setAttachments(attachments); |
120 | 120 | ||
121 | QString header, message; | 121 | QString header, message; |
122 | MailFactory::genMail(header, message, smail, this); | 122 | MailFactory::genMail(header, message, smail, this); |
123 | if (header.isNull() || message.isNull()) return;// Aborted. | ||
123 | 124 | ||
124 | abort->setEnabled(true); | 125 | abort->setEnabled(true); |
125 | 126 | ||
126 | SmtpHandler *handler = new SmtpHandler(header, message, accountsLoaded[from->currentItem()], to->text()); | 127 | SmtpHandler *handler = new SmtpHandler(header, message, accountsLoaded[from->currentItem()], to->text()); |
127 | connect(handler, SIGNAL(finished()), SLOT(slotSendFinished())); | 128 | connect(handler, SIGNAL(finished()), SLOT(slotSendFinished())); |
128 | connect(handler, SIGNAL(error(const QString &)), SLOT(slotSendError(const QString &))); | 129 | connect(handler, SIGNAL(error(const QString &)), SLOT(slotSendError(const QString &))); |
129 | connect(handler, SIGNAL(status(const QString &)), status, SLOT(setText(const QString &))); | 130 | connect(handler, SIGNAL(status(const QString &)), status, SLOT(setText(const QString &))); |
130 | } | 131 | } |
131 | 132 | ||
132 | void Composer::slotSendError(const QString &error) | 133 | void Composer::slotSendError(const QString &error) |
133 | { | 134 | { |
134 | status->setText(tr("<font color=#ff0000>Error occoured during sending.</font>")); | 135 | status->setText(tr("<font color=#ff0000>Error occoured during sending.</font>")); |
135 | QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok")); | 136 | QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok")); |
136 | } | 137 | } |
137 | 138 | ||
138 | void Composer::slotSendFinished() | 139 | void Composer::slotSendFinished() |
139 | { | 140 | { |
140 | QMessageBox::information(this, tr("Success"), tr("<p>The mail was sent successfully.</p>"), tr("Ok")); | 141 | QMessageBox::information(this, tr("Success"), tr("<p>The mail was sent successfully.</p>"), tr("Ok")); |
141 | 142 | ||
142 | status->setText(QString(0)); | 143 | status->setText(QString(0)); |
143 | abort->setEnabled(false); | 144 | abort->setEnabled(false); |
144 | } | 145 | } |
145 | 146 | ||
146 | void Composer::slotFillStuff() | 147 | void Composer::slotFillStuff() |