Diffstat (limited to 'noncore/net/mail/libmailwrapper/smtpwrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/smtpwrapper.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp index 86673aa..e2cea7a 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp | |||
@@ -1,39 +1,40 @@ | |||
1 | #include "smtpwrapper.h" | 1 | #include "smtpwrapper.h" |
2 | #include "mailwrapper.h" | 2 | #include "mailwrapper.h" |
3 | #include "abstractmail.h" | 3 | #include "abstractmail.h" |
4 | #include "logindialog.h" | 4 | #include "logindialog.h" |
5 | #include "mailtypes.h" | 5 | #include "mailtypes.h" |
6 | #include "sendmailprogress.h" | 6 | #include "sendmailprogress.h" |
7 | 7 | ||
8 | #include <qt.h> | 8 | #include <qt.h> |
9 | 9 | ||
10 | #include <qpe/config.h> | 10 | #include <qpe/config.h> |
11 | #include <qpe/qcopenvelope_qws.h> | 11 | #include <qpe/qcopenvelope_qws.h> |
12 | 12 | ||
13 | #include <libetpan/libetpan.h> | 13 | #include <libetpan/libetpan.h> |
14 | 14 | ||
15 | 15 | ||
16 | using namespace Opie::Core; | ||
16 | progressMailSend*SMTPwrapper::sendProgress = 0; | 17 | progressMailSend*SMTPwrapper::sendProgress = 0; |
17 | 18 | ||
18 | SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp ) | 19 | SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp ) |
19 | : Generatemail() | 20 | : Generatemail() |
20 | { | 21 | { |
21 | m_SmtpAccount = aSmtp; | 22 | m_SmtpAccount = aSmtp; |
22 | Config cfg( "mail" ); | 23 | Config cfg( "mail" ); |
23 | cfg.setGroup( "Status" ); | 24 | cfg.setGroup( "Status" ); |
24 | m_queuedMail = cfg.readNumEntry( "outgoing", 0 ); | 25 | m_queuedMail = cfg.readNumEntry( "outgoing", 0 ); |
25 | emit queuedMails( m_queuedMail ); | 26 | emit queuedMails( m_queuedMail ); |
26 | connect( this, SIGNAL( queuedMails(int) ), this, SLOT( emitQCop(int) ) ); | 27 | connect( this, SIGNAL( queuedMails(int) ), this, SLOT( emitQCop(int) ) ); |
27 | m_smtp = 0; | 28 | m_smtp = 0; |
28 | } | 29 | } |
29 | 30 | ||
30 | SMTPwrapper::~SMTPwrapper() | 31 | SMTPwrapper::~SMTPwrapper() |
31 | { | 32 | { |
32 | disc_server(); | 33 | disc_server(); |
33 | } | 34 | } |
34 | 35 | ||
35 | void SMTPwrapper::emitQCop( int queued ) { | 36 | void SMTPwrapper::emitQCop( int queued ) { |
36 | QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" ); | 37 | QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" ); |
37 | env << queued; | 38 | env << queued; |
38 | } | 39 | } |
39 | 40 | ||
@@ -291,49 +292,49 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size ) | |||
291 | QString failuretext = ""; | 292 | QString failuretext = ""; |
292 | 293 | ||
293 | connect_server(); | 294 | connect_server(); |
294 | 295 | ||
295 | result = 1; | 296 | result = 1; |
296 | if (m_smtp) { | 297 | if (m_smtp) { |
297 | err = mailsmtp_send( m_smtp, from, rcpts, data, size ); | 298 | err = mailsmtp_send( m_smtp, from, rcpts, data, size ); |
298 | if ( err != MAILSMTP_NO_ERROR ) { | 299 | if ( err != MAILSMTP_NO_ERROR ) { |
299 | failuretext=tr("Error sending mail: %1").arg(mailsmtpError(err)); | 300 | failuretext=tr("Error sending mail: %1").arg(mailsmtpError(err)); |
300 | result = 0; | 301 | result = 0; |
301 | } | 302 | } |
302 | } else { | 303 | } else { |
303 | result = 0; | 304 | result = 0; |
304 | } | 305 | } |
305 | 306 | ||
306 | if (!result) { | 307 | if (!result) { |
307 | storeFailedMail(data,size,failuretext); | 308 | storeFailedMail(data,size,failuretext); |
308 | } else { | 309 | } else { |
309 | qDebug( "Mail sent." ); | 310 | qDebug( "Mail sent." ); |
310 | storeMail(data,size,"Sent"); | 311 | storeMail(data,size,"Sent"); |
311 | } | 312 | } |
312 | return result; | 313 | return result; |
313 | } | 314 | } |
314 | 315 | ||
315 | void SMTPwrapper::sendMail(const Opie::OSmartPointer<Mail>&mail,bool later ) | 316 | void SMTPwrapper::sendMail(const Opie::Core::OSmartPointer<Mail>&mail,bool later ) |
316 | { | 317 | { |
317 | mailmime * mimeMail; | 318 | mailmime * mimeMail; |
318 | 319 | ||
319 | mimeMail = createMimeMail(mail ); | 320 | mimeMail = createMimeMail(mail ); |
320 | if ( mimeMail == NULL ) { | 321 | if ( mimeMail == NULL ) { |
321 | qDebug( "sendMail: error creating mime mail" ); | 322 | qDebug( "sendMail: error creating mime mail" ); |
322 | } else { | 323 | } else { |
323 | sendProgress = new progressMailSend(); | 324 | sendProgress = new progressMailSend(); |
324 | sendProgress->show(); | 325 | sendProgress->show(); |
325 | sendProgress->setMaxMails(1); | 326 | sendProgress->setMaxMails(1); |
326 | smtpSend( mimeMail,later); | 327 | smtpSend( mimeMail,later); |
327 | qDebug("Clean up done"); | 328 | qDebug("Clean up done"); |
328 | sendProgress->hide(); | 329 | sendProgress->hide(); |
329 | delete sendProgress; | 330 | delete sendProgress; |
330 | sendProgress = 0; | 331 | sendProgress = 0; |
331 | mailmime_free( mimeMail ); | 332 | mailmime_free( mimeMail ); |
332 | } | 333 | } |
333 | } | 334 | } |
334 | 335 | ||
335 | int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,const RecMailP&which) { | 336 | int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,const RecMailP&which) { |
336 | size_t curTok = 0; | 337 | size_t curTok = 0; |
337 | mailimf_fields *fields = 0; | 338 | mailimf_fields *fields = 0; |
338 | mailimf_field*ffrom = 0; | 339 | mailimf_field*ffrom = 0; |
339 | clist *rcpts = 0; | 340 | clist *rcpts = 0; |