Diffstat (limited to 'noncore/net/mail/opiemail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/opiemail.cpp | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp index d3d3cdb..ea0019d 100644 --- a/noncore/net/mail/opiemail.cpp +++ b/noncore/net/mail/opiemail.cpp | |||
@@ -14,4 +14,5 @@ | |||
14 | #include "viewmail.h" | 14 | #include "viewmail.h" |
15 | #include "selectstore.h" | 15 | #include "selectstore.h" |
16 | #include "selectsmtp.h" | ||
16 | 17 | ||
17 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) | 18 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) |
@@ -69,13 +70,28 @@ void OpieMail::slotSendQueued() | |||
69 | 70 | ||
70 | QList<Account> list = settings->getAccounts(); | 71 | QList<Account> list = settings->getAccounts(); |
72 | QList<SMTPaccount> smtpList; | ||
73 | smtpList.setAutoDelete(false); | ||
71 | Account *it; | 74 | Account *it; |
72 | // if (list.count()==1) { | 75 | for ( it = list.first(); it; it = list.next() ) { |
73 | for ( it = list.first(); it; it = list.next() ) { | 76 | if ( it->getType().compare( "SMTP" ) == 0 ) { |
74 | if ( it->getType().compare( "SMTP" ) == 0 ) { | 77 | smtp = static_cast<SMTPaccount *>(it); |
75 | smtp = static_cast<SMTPaccount *>(it); | 78 | smtpList.append(smtp); |
76 | break; | ||
77 | } | ||
78 | } | 79 | } |
79 | // } | 80 | } |
81 | if (smtpList.count()==0) { | ||
82 | QMessageBox::information(0,tr("Info"),tr("Define a smtp account first")); | ||
83 | return; | ||
84 | } | ||
85 | if (smtpList.count()==1) { | ||
86 | smtp = smtpList.at(0); | ||
87 | } else { | ||
88 | smtp = 0; | ||
89 | selectsmtp selsmtp; | ||
90 | selsmtp.setSelectionlist(&smtpList); | ||
91 | selsmtp.showMaximized(); | ||
92 | if (selsmtp.exec()==QDialog::Accepted) { | ||
93 | smtp = selsmtp.selected_smtp(); | ||
94 | } | ||
95 | } | ||
80 | if (smtp) { | 96 | if (smtp) { |
81 | SMTPwrapper * wrap = new SMTPwrapper(settings); | 97 | SMTPwrapper * wrap = new SMTPwrapper(settings); |