Diffstat (limited to 'noncore/net/mail/libmailwrapper/mailwrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailwrapper.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp index 898e9d6..3ffc274 100644 --- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp | |||
@@ -199,3 +199,3 @@ mailmime *MailWrapper::buildTxtPart( QString str ) | |||
199 | 199 | ||
200 | err = clist_append( content->parameters, param ); | 200 | err = clist_append( content->ct_parameters, param ); |
201 | if ( err != MAILIMF_NO_ERROR ) goto err_free_content; | 201 | if ( err != MAILIMF_NO_ERROR ) goto err_free_content; |
@@ -255,3 +255,3 @@ mailmime *MailWrapper::buildFilePart( QString filename, QString mimetype ) | |||
255 | 255 | ||
256 | err = clist_append( content->parameters, param ); | 256 | err = clist_append( content->ct_parameters, param ); |
257 | if ( err != MAILIMF_NO_ERROR ) goto err_free_param; | 257 | if ( err != MAILIMF_NO_ERROR ) goto err_free_param; |
@@ -349,6 +349,6 @@ mailimf_field *MailWrapper::getField( mailimf_fields *fields, int type ) | |||
349 | 349 | ||
350 | it = clist_begin( fields->list ); | 350 | it = clist_begin( fields->fld_list ); |
351 | while ( it ) { | 351 | while ( it ) { |
352 | field = (mailimf_field *) it->data; | 352 | field = (mailimf_field *) it->data; |
353 | if ( field->type == type ) { | 353 | if ( field->fld_type == type ) { |
354 | return field; | 354 | return field; |
@@ -365,3 +365,3 @@ static void addRcpts( clist *list, mailimf_address_list *addr_list ) | |||
365 | 365 | ||
366 | for ( it = clist_begin( addr_list->list ); it; it = it->next ) { | 366 | for ( it = clist_begin( addr_list->ad_list ); it; it = it->next ) { |
367 | mailimf_address *addr; | 367 | mailimf_address *addr; |
@@ -369,6 +369,6 @@ static void addRcpts( clist *list, mailimf_address_list *addr_list ) | |||
369 | 369 | ||
370 | if ( addr->type == MAILIMF_ADDRESS_MAILBOX ) { | 370 | if ( addr->ad_type == MAILIMF_ADDRESS_MAILBOX ) { |
371 | esmtp_address_list_add( list, addr->mailbox->addr_spec, 0, NULL ); | 371 | esmtp_address_list_add( list, addr->ad_data.ad_mailbox->mb_addr_spec, 0, NULL ); |
372 | } else if ( addr->type == MAILIMF_ADDRESS_GROUP ) { | 372 | } else if ( addr->ad_type == MAILIMF_ADDRESS_GROUP ) { |
373 | clist *l = addr->group->mb_list->list; | 373 | clist *l = addr->ad_data.ad_group->grp_mb_list->mb_list; |
374 | for ( it2 = clist_begin( l ); it2; it2 = it2->next ) { | 374 | for ( it2 = clist_begin( l ); it2; it2 = it2->next ) { |
@@ -376,3 +376,3 @@ static void addRcpts( clist *list, mailimf_address_list *addr_list ) | |||
376 | mbox = (mailimf_mailbox *) it2->data; | 376 | mbox = (mailimf_mailbox *) it2->data; |
377 | esmtp_address_list_add( list, mbox->addr_spec, 0, NULL ); | 377 | esmtp_address_list_add( list, mbox->mb_addr_spec, 0, NULL ); |
378 | } | 378 | } |
@@ -390,5 +390,5 @@ clist *MailWrapper::createRcptList( mailimf_fields *fields ) | |||
390 | field = getField( fields, MAILIMF_FIELD_TO ); | 390 | field = getField( fields, MAILIMF_FIELD_TO ); |
391 | if ( field && (field->type == MAILIMF_FIELD_TO) | 391 | if ( field && (field->fld_type == MAILIMF_FIELD_TO) |
392 | && field->field.to->addr_list ) { | 392 | && field->fld_data.fld_to->to_addr_list ) { |
393 | addRcpts( rcptList, field->field.to->addr_list ); | 393 | addRcpts( rcptList, field->fld_data.fld_to->to_addr_list ); |
394 | } | 394 | } |
@@ -396,5 +396,5 @@ clist *MailWrapper::createRcptList( mailimf_fields *fields ) | |||
396 | field = getField( fields, MAILIMF_FIELD_CC ); | 396 | field = getField( fields, MAILIMF_FIELD_CC ); |
397 | if ( field && (field->type == MAILIMF_FIELD_CC) | 397 | if ( field && (field->fld_type == MAILIMF_FIELD_CC) |
398 | && field->field.cc->addr_list ) { | 398 | && field->fld_data.fld_cc->cc_addr_list ) { |
399 | addRcpts( rcptList, field->field.cc->addr_list ); | 399 | addRcpts( rcptList, field->fld_data.fld_cc->cc_addr_list ); |
400 | } | 400 | } |
@@ -402,5 +402,5 @@ clist *MailWrapper::createRcptList( mailimf_fields *fields ) | |||
402 | field = getField( fields, MAILIMF_FIELD_BCC ); | 402 | field = getField( fields, MAILIMF_FIELD_BCC ); |
403 | if ( field && (field->type == MAILIMF_FIELD_BCC) | 403 | if ( field && (field->fld_type == MAILIMF_FIELD_BCC) |
404 | && field->field.bcc->addr_list ) { | 404 | && field->fld_data.fld_bcc->bcc_addr_list ) { |
405 | addRcpts( rcptList, field->field.bcc->addr_list ); | 405 | addRcpts( rcptList, field->fld_data.fld_bcc->bcc_addr_list ); |
406 | } | 406 | } |
@@ -415,6 +415,6 @@ char *MailWrapper::getFrom( mailmime *mail ) | |||
415 | mailimf_field *ffrom; | 415 | mailimf_field *ffrom; |
416 | ffrom = getField( mail->fields, MAILIMF_FIELD_FROM ); | 416 | ffrom = getField( mail->mm_data.mm_message.mm_fields, MAILIMF_FIELD_FROM ); |
417 | if ( ffrom && (ffrom->type == MAILIMF_FIELD_FROM) | 417 | if ( ffrom && (ffrom->fld_type == MAILIMF_FIELD_FROM) |
418 | && ffrom->field.from->mb_list && ffrom->field.from->mb_list->list ) { | 418 | && ffrom->fld_data.fld_from->frm_mb_list && ffrom->fld_data.fld_from->frm_mb_list->mb_list ) { |
419 | clist *cl = ffrom->field.from->mb_list->list; | 419 | clist *cl = ffrom->fld_data.fld_from->frm_mb_list->mb_list; |
420 | clistiter *it; | 420 | clistiter *it; |
@@ -422,3 +422,3 @@ char *MailWrapper::getFrom( mailmime *mail ) | |||
422 | mailimf_mailbox *mb = (mailimf_mailbox *) it->data; | 422 | mailimf_mailbox *mb = (mailimf_mailbox *) it->data; |
423 | from = strdup( mb->addr_spec ); | 423 | from = strdup( mb->mb_addr_spec ); |
424 | } | 424 | } |
@@ -544,3 +544,3 @@ void MailWrapper::smtpSend( mailmime *mail ) | |||
544 | port = smtp->getPort().toUInt(); | 544 | port = smtp->getPort().toUInt(); |
545 | rcpts = createRcptList( mail->fields ); | 545 | rcpts = createRcptList( mail->mm_data.mm_message.mm_fields ); |
546 | 546 | ||