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 )
 
-    err = clist_append( content->parameters, param );
+    err = clist_append( content->ct_parameters, param );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_content;
@@ -255,3 +255,3 @@ mailmime *MailWrapper::buildFilePart( QString filename, QString mimetype )
 
-        err = clist_append( content->parameters, param );
+        err = clist_append( content->ct_parameters, param );
         if ( err != MAILIMF_NO_ERROR ) goto err_free_param;
@@ -349,6 +349,6 @@ mailimf_field *MailWrapper::getField( mailimf_fields *fields, int type )
 
-    it = clist_begin( fields->list );
+    it = clist_begin( fields->fld_list );
     while ( it ) {
         field = (mailimf_field *) it->data;
-        if ( field->type == type ) {
+        if ( field->fld_type == type ) {
             return field;
@@ -365,3 +365,3 @@ static void addRcpts( clist *list, mailimf_address_list *addr_list )
 
-    for ( it = clist_begin( addr_list->list ); it; it = it->next ) {
+    for ( it = clist_begin( addr_list->ad_list ); it; it = it->next ) {
         mailimf_address *addr;
@@ -369,6 +369,6 @@ static void addRcpts( clist *list, mailimf_address_list *addr_list )
 
-        if ( addr->type == MAILIMF_ADDRESS_MAILBOX ) {
-                esmtp_address_list_add( list, addr->mailbox->addr_spec, 0, NULL );
-        } else if ( addr->type == MAILIMF_ADDRESS_GROUP ) {
-            clist *l = addr->group->mb_list->list;
+        if ( addr->ad_type == MAILIMF_ADDRESS_MAILBOX ) {
+                esmtp_address_list_add( list, addr->ad_data.ad_mailbox->mb_addr_spec, 0, NULL );
+        } else if ( addr->ad_type == MAILIMF_ADDRESS_GROUP ) {
+            clist *l = addr->ad_data.ad_group->grp_mb_list->mb_list;
                 for ( it2 = clist_begin( l ); it2; it2 = it2->next ) {
@@ -376,3 +376,3 @@ static void addRcpts( clist *list, mailimf_address_list *addr_list )
                     mbox = (mailimf_mailbox *) it2->data;
-                    esmtp_address_list_add( list, mbox->addr_spec, 0, NULL );
+                    esmtp_address_list_add( list, mbox->mb_addr_spec, 0, NULL );
                 }
@@ -390,5 +390,5 @@ clist *MailWrapper::createRcptList( mailimf_fields *fields )
     field = getField( fields, MAILIMF_FIELD_TO );
-    if ( field && (field->type == MAILIMF_FIELD_TO)
-         && field->field.to->addr_list ) {
-        addRcpts( rcptList, field->field.to->addr_list );
+    if ( field && (field->fld_type == MAILIMF_FIELD_TO)
+         && field->fld_data.fld_to->to_addr_list ) {
+        addRcpts( rcptList, field->fld_data.fld_to->to_addr_list );
     }
@@ -396,5 +396,5 @@ clist *MailWrapper::createRcptList( mailimf_fields *fields )
     field = getField( fields, MAILIMF_FIELD_CC );
-    if ( field && (field->type == MAILIMF_FIELD_CC)
-         && field->field.cc->addr_list ) {
-        addRcpts( rcptList, field->field.cc->addr_list );
+    if ( field && (field->fld_type == MAILIMF_FIELD_CC)
+         && field->fld_data.fld_cc->cc_addr_list ) {
+        addRcpts( rcptList, field->fld_data.fld_cc->cc_addr_list );
     }
@@ -402,5 +402,5 @@ clist *MailWrapper::createRcptList( mailimf_fields *fields )
     field = getField( fields, MAILIMF_FIELD_BCC );
-    if ( field && (field->type == MAILIMF_FIELD_BCC)
-         && field->field.bcc->addr_list ) {
-        addRcpts( rcptList, field->field.bcc->addr_list );
+    if ( field && (field->fld_type == MAILIMF_FIELD_BCC)
+         && field->fld_data.fld_bcc->bcc_addr_list ) {
+        addRcpts( rcptList, field->fld_data.fld_bcc->bcc_addr_list );
     }
@@ -415,6 +415,6 @@ char *MailWrapper::getFrom( mailmime *mail )
     mailimf_field *ffrom;
-    ffrom = getField( mail->fields, MAILIMF_FIELD_FROM );
-    if ( ffrom && (ffrom->type == MAILIMF_FIELD_FROM)
-         && ffrom->field.from->mb_list && ffrom->field.from->mb_list->list ) {
-        clist *cl = ffrom->field.from->mb_list->list;
+    ffrom = getField( mail->mm_data.mm_message.mm_fields, MAILIMF_FIELD_FROM );
+    if ( ffrom && (ffrom->fld_type == MAILIMF_FIELD_FROM)
+         && ffrom->fld_data.fld_from->frm_mb_list && ffrom->fld_data.fld_from->frm_mb_list->mb_list ) {
+        clist *cl = ffrom->fld_data.fld_from->frm_mb_list->mb_list;
         clistiter *it;
@@ -422,3 +422,3 @@ char *MailWrapper::getFrom( mailmime *mail )
             mailimf_mailbox *mb = (mailimf_mailbox *) it->data;
-            from = strdup( mb->addr_spec );
+            from = strdup( mb->mb_addr_spec );
         }
@@ -544,3 +544,3 @@ void MailWrapper::smtpSend( mailmime *mail )
     port = smtp->getPort().toUInt();
-    rcpts = createRcptList( mail->fields );
+    rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );