summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/libmailwrapper/generatemail.cpp30
-rw-r--r--noncore/net/mail/libmailwrapper/generatemail.h6
-rw-r--r--noncore/net/mail/libmailwrapper/mailwrapper.cpp4
-rw-r--r--noncore/net/mail/libmailwrapper/mailwrapper.h4
-rw-r--r--noncore/net/mail/libmailwrapper/smtpwrapper.cpp2
-rw-r--r--noncore/net/mail/libmailwrapper/smtpwrapper.h4
-rw-r--r--noncore/net/mail/libmailwrapper/storemail.cpp2
-rw-r--r--noncore/net/mail/libmailwrapper/storemail.h2
8 files changed, 31 insertions, 23 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
@@ -5,7 +5,7 @@
#include <qt.h>
-const char* Generatemail::USER_AGENT="OpieMail v0.5";
+const char* Generatemail::USER_AGENT="OpieMail v0.6";
Generatemail::Generatemail()
{
@@ -279,7 +279,7 @@ mailimf_mailbox *Generatemail::newMailbox(const QString&name, const QString&mail
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;
@@ -287,17 +287,17 @@ mailimf_fields *Generatemail::createImfFields(const Mail&mail )
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;
@@ -317,17 +317,17 @@ mailimf_fields *Generatemail::createImfFields(const Mail&mail )
}
}
- 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));
@@ -399,7 +399,7 @@ mailimf_fields *Generatemail::createImfFields(const Mail&mail )
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;
@@ -414,7 +414,7 @@ mailmime *Generatemail::createMimeMail(const Mail &mail ) {
mailmime_set_imf_fields( message, fields );
- txtPart = buildTxtPart( mail.getMessage() );
+ txtPart = buildTxtPart( mail->getMessage() );
if ( txtPart == NULL )
goto err_free_message;
@@ -423,7 +423,7 @@ mailmime *Generatemail::createMimeMail(const Mail &mail ) {
if ( err != MAILIMF_NO_ERROR )
goto err_free_txtPart;
- addFileParts( message, mail.getAttachments() );
+ addFileParts( message, mail->getAttachments() );
return message; // Success :)
diff --git a/noncore/net/mail/libmailwrapper/generatemail.h b/noncore/net/mail/libmailwrapper/generatemail.h
index 8be5a2b..409a55e 100644
--- a/noncore/net/mail/libmailwrapper/generatemail.h
+++ b/noncore/net/mail/libmailwrapper/generatemail.h
@@ -6,6 +6,8 @@
#include <qobject.h>
#include <libetpan/clist.h>
+#include <opie2/osmart_pointer.h>
+
class Mail;
class RecMail;
class Attachment;
@@ -34,8 +36,8 @@ protected:
mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content);
mailmime *buildTxtPart(const QString&str );
mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
- mailimf_fields *createImfFields(const Mail &mail );
- mailmime *createMimeMail(const Mail&mail );
+ mailimf_fields *createImfFields(const Opie::osmart_pointer<Mail> &mail );
+ mailmime *createMimeMail(const Opie::osmart_pointer<Mail>&mail );
clist *createRcptList( mailimf_fields *fields );
static const char* USER_AGENT;
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
index ebdbf4b..6bd98f6 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
@@ -45,7 +45,9 @@ IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,bool no
{
// Decode IMAP foldername
nameDisplay = IMAPFolder::decodeFolderName( name );
+ /*
qDebug( "folder " + name + " - displayed as " + nameDisplay );
+ */
prefix = aprefix;
if (prefix.length()>0) {
@@ -145,7 +147,7 @@ QString IMAPFolder::decodeFolderName( const QString &name )
}
Mail::Mail()
- :name(""), mail(""), to(""), cc(""), bcc(""), reply(""), subject(""), message("")
+ :Opie::oref_count(),name(""), mail(""), to(""), cc(""), bcc(""), reply(""), subject(""), message("")
{
}
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h
index 3a9f97b..c66572c 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.h
@@ -8,6 +8,8 @@
#include "settings.h"
+#include <opie2/osmart_pointer.h>
+
class Attachment
{
public:
@@ -26,7 +28,7 @@ protected:
};
-class Mail
+class Mail:public Opie::oref_count
{
public:
Mail();
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index a4e0beb..afc5618 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -312,7 +312,7 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size )
return result;
}
-void SMTPwrapper::sendMail(const Mail&mail,bool later )
+void SMTPwrapper::sendMail(const Opie::osmart_pointer<Mail>&mail,bool later )
{
mailmime * mimeMail;
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index 1796df7..08bde74 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -11,6 +11,8 @@
#include "settings.h"
#include "generatemail.h"
+#include <opie2/osmart_pointer.h>
+
class SMTPaccount;
class AbstractMail;
@@ -21,7 +23,7 @@ class SMTPwrapper : public Generatemail
public:
SMTPwrapper(SMTPaccount * aSmtp);
virtual ~SMTPwrapper();
- void sendMail(const Mail& mail,bool later=false );
+ void sendMail(const Opie::osmart_pointer<Mail>& mail,bool later=false );
bool flushOutbox();
static progressMailSend*sendProgress;
diff --git a/noncore/net/mail/libmailwrapper/storemail.cpp b/noncore/net/mail/libmailwrapper/storemail.cpp
index 53101f8..052e0f1 100644
--- a/noncore/net/mail/libmailwrapper/storemail.cpp
+++ b/noncore/net/mail/libmailwrapper/storemail.cpp
@@ -49,7 +49,7 @@ Storemail::~Storemail()
{
}
-int Storemail::storeMail(const Mail&mail)
+int Storemail::storeMail(const Opie::osmart_pointer<Mail>&mail)
{
if (!wrapper) return 0;
int ret = 1;
diff --git a/noncore/net/mail/libmailwrapper/storemail.h b/noncore/net/mail/libmailwrapper/storemail.h
index 872c981..7d8ea3d 100644
--- a/noncore/net/mail/libmailwrapper/storemail.h
+++ b/noncore/net/mail/libmailwrapper/storemail.h
@@ -18,7 +18,7 @@ public:
Storemail(const QString&aFolder);
virtual ~Storemail();
- int storeMail(const Mail&mail);
+ int storeMail(const Opie::osmart_pointer<Mail>&mail);
protected:
Account* m_Account;