1 files changed, 15 insertions, 15 deletions

diff --git a/noncore/net/mail/libmailwrapper/generatemail.cpp b/noncore/net/mail/libmailwrapper/generatemail.cpp
index 48fa02e..4f7ec0c 100644
--- a/noncore/net/mail/libmailwrapper/generatemail.cpp
+++ b/noncore/net/mail/libmailwrapper/generatemail.cpp
@@ -1,20 +1,20 @@
 #include "generatemail.h"
 #include "mailwrapper.h"
 
 #include <libetpan/libetpan.h>
 
 #include <qt.h>
 
-const char* Generatemail::USER_AGENT="OpieMail v0.5";
+const char* Generatemail::USER_AGENT="OpieMail v0.6";
 
 Generatemail::Generatemail()
 {
 }
 
 Generatemail::~Generatemail()
 {
 }
 
 void Generatemail::addRcpts( clist *list, mailimf_address_list *addr_list ) {
     clistiter *it, *it2;
 
@@ -270,73 +270,73 @@ err_free_param:
     mailmime_parameter_free( param );
 err_free:
     qDebug( "buildTxtPart - error" );
 
     return NULL;        // Error :(
 }
 
 mailimf_mailbox *Generatemail::newMailbox(const QString&name, const QString&mail ) {
     return mailimf_mailbox_new( strdup( name.latin1() ),
                                 strdup( mail.latin1() ) );
 }
 
-mailimf_fields *Generatemail::createImfFields(const Mail&mail )
+mailimf_fields *Generatemail::createImfFields(const Opie::osmart_pointer<Mail>&mail )
 {
     mailimf_fields *fields = NULL;
     mailimf_field *xmailer = NULL;
     mailimf_mailbox *sender=0,*fromBox=0;
     mailimf_mailbox_list *from=0;
     mailimf_address_list *to=0, *cc=0, *bcc=0, *reply=0;
     clist*in_reply_to = 0;
-    char *subject = strdup( mail.getSubject().latin1() );
+    char *subject = strdup( mail->getSubject().latin1() );
     int err;
     int res = 1;
 
-    sender = newMailbox( mail.getName(), mail.getMail() );
+    sender = newMailbox( mail->getName(), mail->getMail() );
     if ( sender == NULL ) {
         res = 0;
     }
 
     if (res) {
-        fromBox = newMailbox( mail.getName(), mail.getMail() );
+        fromBox = newMailbox( mail->getName(), mail->getMail() );
     }
     if ( fromBox == NULL ) {
         res = 0;
     }
 
     if (res) {
         from = mailimf_mailbox_list_new_empty();
     }
     if ( from == NULL ) {
         res = 0;
     }
 
     if (res && from) {
         err = mailimf_mailbox_list_add( from, fromBox );
         if ( err != MAILIMF_NO_ERROR ) {
             res = 0;
         }
     }
 
-    if (res) to = parseAddresses( mail.getTo() );
-    if (res) cc = parseAddresses( mail.getCC() );
-    if (res) bcc = parseAddresses( mail.getBCC() );
-    if (res) reply = parseAddresses( mail.getReply() );
+    if (res) to = parseAddresses( mail->getTo() );
+    if (res) cc = parseAddresses( mail->getCC() );
+    if (res) bcc = parseAddresses( mail->getBCC() );
+    if (res) reply = parseAddresses( mail->getReply() );
 
-    if (res && mail.Inreply().count()>0) {
+    if (res && mail->Inreply().count()>0) {
         in_reply_to = clist_new();
         char*c_reply;
         unsigned int nsize = 0;
-        for (QStringList::ConstIterator it=mail.Inreply().begin();
-             it != mail.Inreply().end();++it) {
+        for (QStringList::ConstIterator it=mail->Inreply().begin();
+             it != mail->Inreply().end();++it) {
             if ((*it).isEmpty())
                 continue;
             QString h((*it));
             while (h.length()>0 && h[0]=='<') {
                 h.remove(0,1);
             }
             while (h.length()>0 && h[h.length()-1]=='>') {
                 h.remove(h.length()-1,1);
             }
             if (h.isEmpty()) continue;
             nsize = strlen(h.latin1());
             /* yes! must be malloc! */
@@ -390,49 +390,49 @@ mailimf_fields *Generatemail::createImfFields(const Mail&mail )
             }
             if (sender) {
                 mailimf_mailbox_free( sender );
             }
             if (subject) {
                 free( subject );
             }
         }
     }
     return fields;
 }
 
-mailmime *Generatemail::createMimeMail(const Mail &mail ) {
+mailmime *Generatemail::createMimeMail(const Opie::osmart_pointer<Mail> &mail ) {
     mailmime *message, *txtPart;
     mailimf_fields *fields;
     int err;
 
     fields = createImfFields( mail );
     if ( fields == NULL )
         goto err_free;
 
     message = mailmime_new_message_data( NULL );
     if ( message == NULL )
         goto err_free_fields;
 
     mailmime_set_imf_fields( message, fields );
 
-    txtPart = buildTxtPart( mail.getMessage() );
+    txtPart = buildTxtPart( mail->getMessage() );
 
     if ( txtPart == NULL )
         goto err_free_message;
 
     err = mailmime_smart_add_part( message, txtPart );
     if ( err != MAILIMF_NO_ERROR )
         goto err_free_txtPart;
 
-    addFileParts( message, mail.getAttachments() );
+    addFileParts( message, mail->getAttachments() );
 
     return message;         // Success :)
 
 err_free_txtPart:
     mailmime_free( txtPart );
 err_free_message:
     mailmime_free( message );
 err_free_fields:
     mailimf_fields_free( fields );
 err_free:
     qDebug( "createMimeMail: error" );