summaryrefslogtreecommitdiff
authorconber <conber>2002-06-15 20:53:53 (UTC)
committer conber <conber>2002-06-15 20:53:53 (UTC)
commitbe10ba352f2a89bc5ec816eefc307a4ae2f7ff6b (patch) (unidiff)
tree414e77447b8f8d6baeef6588a009cb65e1353c0b
parente23774336087439cfed07899c8446eab674a3de8 (diff)
downloadopie-be10ba352f2a89bc5ec816eefc307a4ae2f7ff6b.zip
opie-be10ba352f2a89bc5ec816eefc307a4ae2f7ff6b.tar.gz
opie-be10ba352f2a89bc5ec816eefc307a4ae2f7ff6b.tar.bz2
fixed abort bug
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mail2/composer.cpp1
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
@@ -107,32 +107,33 @@ void Composer::slotSendMail()
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
132void Composer::slotSendError(const QString &error) 133void 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
138void Composer::slotSendFinished() 139void Composer::slotSendFinished()