Diffstat (limited to 'noncore/net/mail/pop3wrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/pop3wrapper.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
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(); |