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 | |||
@@ -194,13 +194,13 @@ mailmime *MailWrapper::buildTxtPart( QString str ) | |||
194 | strdup( "iso-8859-1" ) ); | 194 | strdup( "iso-8859-1" ) ); |
195 | if ( param == NULL ) goto err_free; | 195 | if ( param == NULL ) goto err_free; |
196 | 196 | ||
197 | content = mailmime_content_new_with_str( "text/plain" ); | 197 | content = mailmime_content_new_with_str( "text/plain" ); |
198 | if ( content == NULL ) goto err_free_param; | 198 | if ( content == NULL ) goto err_free_param; |
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; |
202 | 202 | ||
203 | fields = mailmime_fields_new_encoding( MAILMIME_MECHANISM_8BIT ); | 203 | fields = mailmime_fields_new_encoding( MAILMIME_MECHANISM_8BIT ); |
204 | if ( fields == NULL ) goto err_free_content; | 204 | if ( fields == NULL ) goto err_free_content; |
205 | 205 | ||
206 | txtPart = mailmime_new_empty( content, fields ); | 206 | txtPart = mailmime_new_empty( content, fields ); |
@@ -250,13 +250,13 @@ mailmime *MailWrapper::buildFilePart( QString filename, QString mimetype ) | |||
250 | 250 | ||
251 | if ( mimetype.compare( "text/plain" ) == 0 ) { | 251 | if ( mimetype.compare( "text/plain" ) == 0 ) { |
252 | param = mailmime_parameter_new( strdup( "charset" ), | 252 | param = mailmime_parameter_new( strdup( "charset" ), |
253 | strdup( "iso-8859-1" ) ); | 253 | strdup( "iso-8859-1" ) ); |
254 | if ( param == NULL ) goto err_free_content; | 254 | if ( param == NULL ) goto err_free_content; |
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; |
258 | } | 258 | } |
259 | 259 | ||
260 | filePart = mailmime_new_empty( content, fields ); | 260 | filePart = mailmime_new_empty( content, fields ); |
261 | if ( filePart == NULL ) goto err_free_param; | 261 | if ( filePart == NULL ) goto err_free_param; |
262 | 262 | ||
@@ -344,40 +344,40 @@ err_free: | |||
344 | 344 | ||
345 | mailimf_field *MailWrapper::getField( mailimf_fields *fields, int type ) | 345 | mailimf_field *MailWrapper::getField( mailimf_fields *fields, int type ) |
346 | { | 346 | { |
347 | mailimf_field *field; | 347 | mailimf_field *field; |
348 | clistiter *it; | 348 | clistiter *it; |
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; |
355 | } | 355 | } |
356 | it = it->next; | 356 | it = it->next; |
357 | } | 357 | } |
358 | 358 | ||
359 | return NULL; | 359 | return NULL; |
360 | } | 360 | } |
361 | 361 | ||
362 | static void addRcpts( clist *list, mailimf_address_list *addr_list ) | 362 | static void addRcpts( clist *list, mailimf_address_list *addr_list ) |
363 | { | 363 | { |
364 | clistiter *it, *it2; | 364 | clistiter *it, *it2; |
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; |
368 | addr = (mailimf_address *) it->data; | 368 | addr = (mailimf_address *) it->data; |
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 ) { |
375 | mailimf_mailbox *mbox; | 375 | mailimf_mailbox *mbox; |
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 | } |
379 | } | 379 | } |
380 | } | 380 | } |
381 | } | 381 | } |
382 | 382 | ||
383 | clist *MailWrapper::createRcptList( mailimf_fields *fields ) | 383 | clist *MailWrapper::createRcptList( mailimf_fields *fields ) |
@@ -385,45 +385,45 @@ clist *MailWrapper::createRcptList( mailimf_fields *fields ) | |||
385 | clist *rcptList; | 385 | clist *rcptList; |
386 | mailimf_field *field; | 386 | mailimf_field *field; |
387 | 387 | ||
388 | rcptList = esmtp_address_list_new(); | 388 | rcptList = esmtp_address_list_new(); |
389 | 389 | ||
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 | } |
395 | 395 | ||
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 | } |
401 | 401 | ||
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 | } |
407 | 407 | ||
408 | return rcptList; | 408 | return rcptList; |
409 | } | 409 | } |
410 | 410 | ||
411 | char *MailWrapper::getFrom( mailmime *mail ) | 411 | char *MailWrapper::getFrom( mailmime *mail ) |
412 | { | 412 | { |
413 | char *from = NULL; | 413 | char *from = NULL; |
414 | 414 | ||
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; |
421 | for ( it = clist_begin( cl ); it; it = it->next ) { | 421 | for ( it = clist_begin( cl ); it; it = it->next ) { |
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 | } |
425 | } | 425 | } |
426 | 426 | ||
427 | return from; | 427 | return from; |
428 | } | 428 | } |
429 | 429 | ||
@@ -539,13 +539,13 @@ void MailWrapper::smtpSend( mailmime *mail ) | |||
539 | free(from); | 539 | free(from); |
540 | return; | 540 | return; |
541 | } | 541 | } |
542 | server = strdup( smtp->getServer().latin1() ); | 542 | server = strdup( smtp->getServer().latin1() ); |
543 | ssl = smtp->getSSL(); | 543 | ssl = smtp->getSSL(); |
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 | ||
547 | QString file = getTmpFile(); | 547 | QString file = getTmpFile(); |
548 | writeToFile( file, mail ); | 548 | writeToFile( file, mail ); |
549 | readFromFile( file, &data, &size ); | 549 | readFromFile( file, &data, &size ); |
550 | QFile f( file ); | 550 | QFile f( file ); |
551 | f.remove(); | 551 | f.remove(); |