Diffstat (limited to 'noncore/net/mail/libmailwrapper/generatemail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/generatemail.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/noncore/net/mail/libmailwrapper/generatemail.cpp b/noncore/net/mail/libmailwrapper/generatemail.cpp index cb7ccc0..cb58d82 100644 --- a/noncore/net/mail/libmailwrapper/generatemail.cpp +++ b/noncore/net/mail/libmailwrapper/generatemail.cpp | |||
@@ -1,19 +1,20 @@ | |||
1 | #include "generatemail.h" | 1 | #include "generatemail.h" |
2 | #include "mailwrapper.h" | 2 | #include "mailwrapper.h" |
3 | 3 | ||
4 | #include <libetpan/libetpan.h> | 4 | #include <libetpan/libetpan.h> |
5 | 5 | ||
6 | #include <qt.h> | 6 | #include <qt.h> |
7 | 7 | ||
8 | using namespace Opie::Core; | ||
8 | const char* Generatemail::USER_AGENT="OpieMail v0.6"; | 9 | const char* Generatemail::USER_AGENT="OpieMail v0.6"; |
9 | 10 | ||
10 | Generatemail::Generatemail() | 11 | Generatemail::Generatemail() |
11 | { | 12 | { |
12 | } | 13 | } |
13 | 14 | ||
14 | Generatemail::~Generatemail() | 15 | Generatemail::~Generatemail() |
15 | { | 16 | { |
16 | } | 17 | } |
17 | 18 | ||
18 | void Generatemail::addRcpts( clist *list, mailimf_address_list *addr_list ) { | 19 | void Generatemail::addRcpts( clist *list, mailimf_address_list *addr_list ) { |
19 | clistiter *it, *it2; | 20 | clistiter *it, *it2; |
@@ -270,25 +271,25 @@ err_free_param: | |||
270 | mailmime_parameter_free( param ); | 271 | mailmime_parameter_free( param ); |
271 | err_free: | 272 | err_free: |
272 | qDebug( "buildTxtPart - error" ); | 273 | qDebug( "buildTxtPart - error" ); |
273 | 274 | ||
274 | return NULL; // Error :( | 275 | return NULL; // Error :( |
275 | } | 276 | } |
276 | 277 | ||
277 | mailimf_mailbox *Generatemail::newMailbox(const QString&name, const QString&mail ) { | 278 | mailimf_mailbox *Generatemail::newMailbox(const QString&name, const QString&mail ) { |
278 | return mailimf_mailbox_new( strdup( name.latin1() ), | 279 | return mailimf_mailbox_new( strdup( name.latin1() ), |
279 | strdup( mail.latin1() ) ); | 280 | strdup( mail.latin1() ) ); |
280 | } | 281 | } |
281 | 282 | ||
282 | mailimf_fields *Generatemail::createImfFields(const Opie::OSmartPointer<Mail>&mail ) | 283 | mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Mail>&mail ) |
283 | { | 284 | { |
284 | mailimf_fields *fields = NULL; | 285 | mailimf_fields *fields = NULL; |
285 | mailimf_field *xmailer = NULL; | 286 | mailimf_field *xmailer = NULL; |
286 | mailimf_mailbox *sender=0,*fromBox=0; | 287 | mailimf_mailbox *sender=0,*fromBox=0; |
287 | mailimf_mailbox_list *from=0; | 288 | mailimf_mailbox_list *from=0; |
288 | mailimf_address_list *to=0, *cc=0, *bcc=0, *reply=0; | 289 | mailimf_address_list *to=0, *cc=0, *bcc=0, *reply=0; |
289 | clist*in_reply_to = 0; | 290 | clist*in_reply_to = 0; |
290 | char *subject = strdup( mail->getSubject().latin1() ); | 291 | char *subject = strdup( mail->getSubject().latin1() ); |
291 | int err; | 292 | int err; |
292 | int res = 1; | 293 | int res = 1; |
293 | 294 | ||
294 | sender = newMailbox( mail->getName(), mail->getMail() ); | 295 | sender = newMailbox( mail->getName(), mail->getMail() ); |
@@ -390,25 +391,25 @@ mailimf_fields *Generatemail::createImfFields(const Opie::OSmartPointer<Mail>&ma | |||
390 | } | 391 | } |
391 | if (sender) { | 392 | if (sender) { |
392 | mailimf_mailbox_free( sender ); | 393 | mailimf_mailbox_free( sender ); |
393 | } | 394 | } |
394 | if (subject) { | 395 | if (subject) { |
395 | free( subject ); | 396 | free( subject ); |
396 | } | 397 | } |
397 | } | 398 | } |
398 | } | 399 | } |
399 | return fields; | 400 | return fields; |
400 | } | 401 | } |
401 | 402 | ||
402 | mailmime *Generatemail::createMimeMail(const Opie::OSmartPointer<Mail> &mail ) { | 403 | mailmime *Generatemail::createMimeMail(const Opie::Core::OSmartPointer<Mail> &mail ) { |
403 | mailmime *message, *txtPart; | 404 | mailmime *message, *txtPart; |
404 | mailimf_fields *fields; | 405 | mailimf_fields *fields; |
405 | int err; | 406 | int err; |
406 | 407 | ||
407 | fields = createImfFields( mail ); | 408 | fields = createImfFields( mail ); |
408 | if ( fields == NULL ) | 409 | if ( fields == NULL ) |
409 | goto err_free; | 410 | goto err_free; |
410 | 411 | ||
411 | message = mailmime_new_message_data( NULL ); | 412 | message = mailmime_new_message_data( NULL ); |
412 | if ( message == NULL ) | 413 | if ( message == NULL ) |
413 | goto err_free_fields; | 414 | goto err_free_fields; |
414 | 415 | ||