summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/libmailwrapper/mailwrapper.cpp50
-rw-r--r--noncore/net/mail/libmailwrapper/pop3wrapper.cpp52
-rw-r--r--noncore/net/mail/libmailwrapper/pop3wrapper.h1
-rw-r--r--noncore/net/mail/mailwrapper.cpp50
-rw-r--r--noncore/net/mail/pop3wrapper.cpp52
-rw-r--r--noncore/net/mail/pop3wrapper.h1
6 files changed, 104 insertions, 102 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
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 72f3c36..633faf6 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -35,5 +35,5 @@ void POP3wrapper::listMessages( QList<RecMail> &target )
35 35
36 err = mailpop3_header( m_pop3, info->index, &header, &length ); 36 err = mailpop3_header( m_pop3, info->msg_index, &header, &length );
37 if ( err != MAILPOP3_NO_ERROR ) { 37 if ( err != MAILPOP3_NO_ERROR ) {
38 qDebug( "POP3: error retrieving header msgid: %i", info->index ); 38 qDebug( "POP3: error retrieving header msgid: %i", info->msg_index );
39 logout(); 39 logout();
@@ -42,3 +42,3 @@ void POP3wrapper::listMessages( QList<RecMail> &target )
42 RecMail *mail = parseHeader( header ); 42 RecMail *mail = parseHeader( header );
43 mail->setNumber( info->index ); 43 mail->setNumber( info->msg_index );
44 target.append( mail ); 44 target.append( mail );
@@ -57,22 +57,22 @@ RecMail *POP3wrapper::parseHeader( const char *header )
57 err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields ); 57 err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields );
58 for ( clistiter *current = clist_begin( fields->list ); current != NULL; current = current->next ) { 58 for ( clistiter *current = clist_begin( fields->fld_list ); current != NULL; current = current->next ) {
59 mailimf_field *field = (mailimf_field *) current->data; 59 mailimf_field *field = (mailimf_field *) current->data;
60 switch ( field->type ) { 60 switch ( field->fld_type ) {
61 case MAILIMF_FIELD_FROM: 61 case MAILIMF_FIELD_FROM:
62 mail->setFrom( *parseMailboxList( field->field.from->mb_list ) ); 62 mail->setFrom( *parseMailboxList( field->fld_data.fld_from->frm_mb_list ) );
63 break; 63 break;
64 case MAILIMF_FIELD_TO: 64 case MAILIMF_FIELD_TO:
65 mail->setTo( *parseAddressList( field->field.to->addr_list ) ); 65 mail->setTo( *parseAddressList( field->fld_data.fld_to->to_addr_list ) );
66 break; 66 break;
67 case MAILIMF_FIELD_CC: 67 case MAILIMF_FIELD_CC:
68 mail->setCC( *parseAddressList( field->field.cc->addr_list ) ); 68 mail->setCC( *parseAddressList( field->fld_data.fld_cc->cc_addr_list ) );
69 break; 69 break;
70 case MAILIMF_FIELD_BCC: 70 case MAILIMF_FIELD_BCC:
71 mail->setBcc( *parseAddressList( field->field.bcc->addr_list ) ); 71 mail->setBcc( *parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) );
72 break; 72 break;
73 case MAILIMF_FIELD_SUBJECT: 73 case MAILIMF_FIELD_SUBJECT:
74 mail->setSubject( QString( field->field.subject->value ) ); 74 mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) );
75 break; 75 break;
76 case MAILIMF_FIELD_ORIG_DATE: 76 case MAILIMF_FIELD_ORIG_DATE:
77 mail->setDate( *parseDateTime( field->field.orig_date->date_time ) ); 77 mail->setDate( *parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) );
78 break; 78 break;
@@ -91,3 +91,3 @@ QString *POP3wrapper::parseDateTime( mailimf_date_time *date )
91 snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i", 91 snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i",
92 date->day, date->month, date->year, date->hour, date->min, date->sec, date->zone ); 92 date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone );
93 93
@@ -103,3 +103,3 @@ QString *POP3wrapper::parseAddressList( mailimf_address_list *list )
103 bool first = true; 103 bool first = true;
104 for ( clistiter *current = clist_begin( list->list ); current != NULL; current = current->next ) { 104 for ( clistiter *current = clist_begin( list->ad_list ); current != NULL; current = current->next ) {
105 mailimf_address *addr = (mailimf_address *) current->data; 105 mailimf_address *addr = (mailimf_address *) current->data;
@@ -114,5 +114,5 @@ QString *POP3wrapper::parseAddressList( mailimf_address_list *list )
114 114
115 switch ( addr->type ) { 115 switch ( addr->ad_type ) {
116 case MAILIMF_ADDRESS_MAILBOX: 116 case MAILIMF_ADDRESS_MAILBOX:
117 tmp = parseMailbox( addr->mailbox ); 117 tmp = parseMailbox( addr->ad_data.ad_mailbox );
118 result->append( *tmp ); 118 result->append( *tmp );
@@ -121,3 +121,3 @@ QString *POP3wrapper::parseAddressList( mailimf_address_list *list )
121 case MAILIMF_ADDRESS_GROUP: 121 case MAILIMF_ADDRESS_GROUP:
122 tmp = parseGroup( addr->group ); 122 tmp = parseGroup( addr->ad_data.ad_group );
123 result->append( *tmp ); 123 result->append( *tmp );
@@ -138,7 +138,7 @@ QString *POP3wrapper::parseGroup( mailimf_group *group )
138 138
139 result->append( group->display_name ); 139 result->append( group->grp_display_name );
140 result->append( ": " ); 140 result->append( ": " );
141 141
142 if ( group->mb_list != NULL ) { 142 if ( group->grp_mb_list != NULL ) {
143 QString *tmp = parseMailboxList( group->mb_list ); 143 QString *tmp = parseMailboxList( group->grp_mb_list );
144 result->append( *tmp ); 144 result->append( *tmp );
@@ -156,8 +156,8 @@ QString *POP3wrapper::parseMailbox( mailimf_mailbox *box )
156 156
157 if ( box->display_name == NULL ) { 157 if ( box->mb_display_name == NULL ) {
158 result->append( box->addr_spec ); 158 result->append( box->mb_addr_spec );
159 } else { 159 } else {
160 result->append( box->display_name ); 160 result->append( box->mb_display_name );
161 result->append( " <" ); 161 result->append( " <" );
162 result->append( box->addr_spec ); 162 result->append( box->mb_addr_spec );
163 result->append( ">" ); 163 result->append( ">" );
@@ -173,3 +173,3 @@ QString *POP3wrapper::parseMailboxList( mailimf_mailbox_list *list )
173 bool first = true; 173 bool first = true;
174 for ( clistiter *current = clist_begin( list->list ); current != NULL; current = current->next ) { 174 for ( clistiter *current = clist_begin( list->mb_list ); current != NULL; current = current->next ) {
175 mailimf_mailbox *box = (mailimf_mailbox *) current->data; 175 mailimf_mailbox *box = (mailimf_mailbox *) current->data;
@@ -214,3 +214,3 @@ void POP3wrapper::login()
214 qDebug( "pop3: error connecting to %s\n reason: %s", server, 214 qDebug( "pop3: error connecting to %s\n reason: %s", server,
215 m_pop3->response ); 215 m_pop3->pop3_response );
216 mailpop3_free( m_pop3 ); 216 mailpop3_free( m_pop3 );
@@ -225,3 +225,3 @@ void POP3wrapper::login()
225 if ( err != MAILPOP3_NO_ERROR ) { 225 if ( err != MAILPOP3_NO_ERROR ) {
226 qDebug( "pop3: error logging in: %s", m_pop3->response ); 226 qDebug( "pop3: error logging in: %s", m_pop3->pop3_response );
227 logout(); 227 logout();
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index a8937fb..4e4abad 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -6,2 +6,3 @@
6class RecMail; 6class RecMail;
7struct mailpop3;
7 8
diff --git a/noncore/net/mail/mailwrapper.cpp b/noncore/net/mail/mailwrapper.cpp
index 898e9d6..3ffc274 100644
--- a/noncore/net/mail/mailwrapper.cpp
+++ b/noncore/net/mail/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
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index 72f3c36..633faf6 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/pop3wrapper.cpp
@@ -35,5 +35,5 @@ void POP3wrapper::listMessages( QList<RecMail> &target )
35 35
36 err = mailpop3_header( m_pop3, info->index, &header, &length ); 36 err = mailpop3_header( m_pop3, info->msg_index, &header, &length );
37 if ( err != MAILPOP3_NO_ERROR ) { 37 if ( err != MAILPOP3_NO_ERROR ) {
38 qDebug( "POP3: error retrieving header msgid: %i", info->index ); 38 qDebug( "POP3: error retrieving header msgid: %i", info->msg_index );
39 logout(); 39 logout();
@@ -42,3 +42,3 @@ void POP3wrapper::listMessages( QList<RecMail> &target )
42 RecMail *mail = parseHeader( header ); 42 RecMail *mail = parseHeader( header );
43 mail->setNumber( info->index ); 43 mail->setNumber( info->msg_index );
44 target.append( mail ); 44 target.append( mail );
@@ -57,22 +57,22 @@ RecMail *POP3wrapper::parseHeader( const char *header )
57 err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields ); 57 err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields );
58 for ( clistiter *current = clist_begin( fields->list ); current != NULL; current = current->next ) { 58 for ( clistiter *current = clist_begin( fields->fld_list ); current != NULL; current = current->next ) {
59 mailimf_field *field = (mailimf_field *) current->data; 59 mailimf_field *field = (mailimf_field *) current->data;
60 switch ( field->type ) { 60 switch ( field->fld_type ) {
61 case MAILIMF_FIELD_FROM: 61 case MAILIMF_FIELD_FROM:
62 mail->setFrom( *parseMailboxList( field->field.from->mb_list ) ); 62 mail->setFrom( *parseMailboxList( field->fld_data.fld_from->frm_mb_list ) );
63 break; 63 break;
64 case MAILIMF_FIELD_TO: 64 case MAILIMF_FIELD_TO:
65 mail->setTo( *parseAddressList( field->field.to->addr_list ) ); 65 mail->setTo( *parseAddressList( field->fld_data.fld_to->to_addr_list ) );
66 break; 66 break;
67 case MAILIMF_FIELD_CC: 67 case MAILIMF_FIELD_CC:
68 mail->setCC( *parseAddressList( field->field.cc->addr_list ) ); 68 mail->setCC( *parseAddressList( field->fld_data.fld_cc->cc_addr_list ) );
69 break; 69 break;
70 case MAILIMF_FIELD_BCC: 70 case MAILIMF_FIELD_BCC:
71 mail->setBcc( *parseAddressList( field->field.bcc->addr_list ) ); 71 mail->setBcc( *parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) );
72 break; 72 break;
73 case MAILIMF_FIELD_SUBJECT: 73 case MAILIMF_FIELD_SUBJECT:
74 mail->setSubject( QString( field->field.subject->value ) ); 74 mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) );
75 break; 75 break;
76 case MAILIMF_FIELD_ORIG_DATE: 76 case MAILIMF_FIELD_ORIG_DATE:
77 mail->setDate( *parseDateTime( field->field.orig_date->date_time ) ); 77 mail->setDate( *parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) );
78 break; 78 break;
@@ -91,3 +91,3 @@ QString *POP3wrapper::parseDateTime( mailimf_date_time *date )
91 snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i", 91 snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i",
92 date->day, date->month, date->year, date->hour, date->min, date->sec, date->zone ); 92 date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone );
93 93
@@ -103,3 +103,3 @@ QString *POP3wrapper::parseAddressList( mailimf_address_list *list )
103 bool first = true; 103 bool first = true;
104 for ( clistiter *current = clist_begin( list->list ); current != NULL; current = current->next ) { 104 for ( clistiter *current = clist_begin( list->ad_list ); current != NULL; current = current->next ) {
105 mailimf_address *addr = (mailimf_address *) current->data; 105 mailimf_address *addr = (mailimf_address *) current->data;
@@ -114,5 +114,5 @@ QString *POP3wrapper::parseAddressList( mailimf_address_list *list )
114 114
115 switch ( addr->type ) { 115 switch ( addr->ad_type ) {
116 case MAILIMF_ADDRESS_MAILBOX: 116 case MAILIMF_ADDRESS_MAILBOX:
117 tmp = parseMailbox( addr->mailbox ); 117 tmp = parseMailbox( addr->ad_data.ad_mailbox );
118 result->append( *tmp ); 118 result->append( *tmp );
@@ -121,3 +121,3 @@ QString *POP3wrapper::parseAddressList( mailimf_address_list *list )
121 case MAILIMF_ADDRESS_GROUP: 121 case MAILIMF_ADDRESS_GROUP:
122 tmp = parseGroup( addr->group ); 122 tmp = parseGroup( addr->ad_data.ad_group );
123 result->append( *tmp ); 123 result->append( *tmp );
@@ -138,7 +138,7 @@ QString *POP3wrapper::parseGroup( mailimf_group *group )
138 138
139 result->append( group->display_name ); 139 result->append( group->grp_display_name );
140 result->append( ": " ); 140 result->append( ": " );
141 141
142 if ( group->mb_list != NULL ) { 142 if ( group->grp_mb_list != NULL ) {
143 QString *tmp = parseMailboxList( group->mb_list ); 143 QString *tmp = parseMailboxList( group->grp_mb_list );
144 result->append( *tmp ); 144 result->append( *tmp );
@@ -156,8 +156,8 @@ QString *POP3wrapper::parseMailbox( mailimf_mailbox *box )
156 156
157 if ( box->display_name == NULL ) { 157 if ( box->mb_display_name == NULL ) {
158 result->append( box->addr_spec ); 158 result->append( box->mb_addr_spec );
159 } else { 159 } else {
160 result->append( box->display_name ); 160 result->append( box->mb_display_name );
161 result->append( " <" ); 161 result->append( " <" );
162 result->append( box->addr_spec ); 162 result->append( box->mb_addr_spec );
163 result->append( ">" ); 163 result->append( ">" );
@@ -173,3 +173,3 @@ QString *POP3wrapper::parseMailboxList( mailimf_mailbox_list *list )
173 bool first = true; 173 bool first = true;
174 for ( clistiter *current = clist_begin( list->list ); current != NULL; current = current->next ) { 174 for ( clistiter *current = clist_begin( list->mb_list ); current != NULL; current = current->next ) {
175 mailimf_mailbox *box = (mailimf_mailbox *) current->data; 175 mailimf_mailbox *box = (mailimf_mailbox *) current->data;
@@ -214,3 +214,3 @@ void POP3wrapper::login()
214 qDebug( "pop3: error connecting to %s\n reason: %s", server, 214 qDebug( "pop3: error connecting to %s\n reason: %s", server,
215 m_pop3->response ); 215 m_pop3->pop3_response );
216 mailpop3_free( m_pop3 ); 216 mailpop3_free( m_pop3 );
@@ -225,3 +225,3 @@ void POP3wrapper::login()
225 if ( err != MAILPOP3_NO_ERROR ) { 225 if ( err != MAILPOP3_NO_ERROR ) {
226 qDebug( "pop3: error logging in: %s", m_pop3->response ); 226 qDebug( "pop3: error logging in: %s", m_pop3->pop3_response );
227 logout(); 227 logout();
diff --git a/noncore/net/mail/pop3wrapper.h b/noncore/net/mail/pop3wrapper.h
index a8937fb..4e4abad 100644
--- a/noncore/net/mail/pop3wrapper.h
+++ b/noncore/net/mail/pop3wrapper.h
@@ -6,2 +6,3 @@
6class RecMail; 6class RecMail;
7struct mailpop3;
7 8