Diffstat (limited to 'noncore/net/mail/libmailwrapper') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/genericwrapper.cpp | 10 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 5 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailstatics.cpp | 23 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailstatics.h | 4 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailtypes.cpp | 18 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailtypes.h | 11 |
6 files changed, 45 insertions, 26 deletions
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp index 703235d..0ac842d 100644 --- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp @@ -381,13 +381,13 @@ QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies) } return res; } void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to) { - int r; + int r,toffset; mailmessage_list * env_list = 0; r = mailsession_get_messages_list(session,&env_list); if (r != MAIL_NO_ERROR) { odebug << "Error message list" << oendl; return; } @@ -434,19 +434,19 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > & mail->setTo(mailbox); } if (single_fields.fld_cc) mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) ); if (single_fields.fld_bcc) mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) ); - if (single_fields.fld_orig_date) - mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) ); - // crashes when accessing pop3 account? + if (single_fields.fld_orig_date) { + QDateTime d = parseDateTime( single_fields.fld_orig_date->dt_date_time,toffset); + mail->setDate( d,toffset ); + } if (single_fields.fld_message_id && single_fields.fld_message_id->mid_value) { mail->setMsgid(QString(single_fields.fld_message_id->mid_value)); } - if (single_fields.fld_reply_to) { QStringList t = parseAddressList(single_fields.fld_reply_to->rt_addr_list); if (t.count()>0) { mail->setReplyto(t[0]); } } diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 56efa0b..8e5212b 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp @@ -369,13 +369,13 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) { RecMail * m = 0; mailimap_msg_att_item *item=0; clistcell *current,*c,*cf; mailimap_msg_att_dynamic*flist; mailimap_flag_fetch*cflag; - int size; + int size,toffset; QBitArray mFlags(7); QStringList addresslist; if (!m_att) { return m; } @@ -421,13 +421,14 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) } } continue; } if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_ENVELOPE) { mailimap_envelope * head = item->att_data.att_static->att_data.att_env; - m->setDate(parseDateTime(head->env_date)); + QDateTime d = parseDateTime(head->env_date,toffset); + m->setDate(d,toffset); m->setSubject(convert_String((const char*)head->env_subject)); if (head->env_from!=NULL) { addresslist = address_list_to_stringlist(head->env_from->frm_list); if (addresslist.count()) { m->setFrom(addresslist.first()); } diff --git a/noncore/net/mail/libmailwrapper/mailstatics.cpp b/noncore/net/mail/libmailwrapper/mailstatics.cpp index 4878dc9..033ec28 100644 --- a/noncore/net/mail/libmailwrapper/mailstatics.cpp +++ b/noncore/net/mail/libmailwrapper/mailstatics.cpp @@ -1,29 +1,30 @@ #include "mailstatics.h" #include <libetpan/libetpan.h> -#include <qpe/timestring.h> +//#include <qpe/timestring.h> -QString MailStatics::parseDateTime(const mailimf_date_time *date ) +QDateTime MailStatics::parseDateTime(const mailimf_date_time *date,int&offset ) { - if (!date) return ""; + offset = 0; + if (!date) { + return QDateTime(); + } QDateTime da(QDate(date->dt_year,date->dt_month,date->dt_day),QTime(date->dt_hour,date->dt_min,date->dt_sec)); - QString timestring = TimeString::numberDateString(QDate(date->dt_year,date->dt_month,date->dt_day))+" "; - timestring+=TimeString::timeString(QTime(date->dt_hour,date->dt_min,date->dt_sec))+" "; - timestring.sprintf(timestring+" %+05i",date->dt_zone); - return timestring; + offset = date->dt_zone; + return da; } -QString MailStatics::parseDateTime(const char*date) +QDateTime MailStatics::parseDateTime(const char*date,int&offset) { - mailimf_date_time * date_time; - QString d = ""; + mailimf_date_time * date_time=0; + QDateTime d; size_t cur_tok = 0; if (!date) return d; int r = mailimf_date_time_parse(date,strlen(date),&cur_tok,&date_time); if (r==MAILIMF_NO_ERROR) { - d = parseDateTime(date_time); + d = parseDateTime(date_time,offset); } if (date_time) { mailimf_date_time_free(date_time); } return d; }
\ No newline at end of file diff --git a/noncore/net/mail/libmailwrapper/mailstatics.h b/noncore/net/mail/libmailwrapper/mailstatics.h index 841d14d..c714ead 100644 --- a/noncore/net/mail/libmailwrapper/mailstatics.h +++ b/noncore/net/mail/libmailwrapper/mailstatics.h @@ -6,14 +6,14 @@ struct mailimf_date_time; class MailStatics { protected: - static QString parseDateTime(const mailimf_date_time * date); - static QString parseDateTime(const char*date); + static QDateTime parseDateTime(const mailimf_date_time * date,int&offset); + static QDateTime parseDateTime(const char*date,int&offset); MailStatics(){}; virtual ~MailStatics(){}; public: }; #endif diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp index d4395a2..b009b75 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.cpp +++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp @@ -1,21 +1,22 @@ #include "mailtypes.h" #include <opie2/odebug.h> +#include <qpe/timestring.h> #include <stdlib.h> using namespace Opie::Core; RecMail::RecMail() - :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7) + :Opie::Core::ORefCount(),subject(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7),maildate(),date("") { init(); } RecMail::RecMail(const RecMail&old) - :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7) + :Opie::Core::ORefCount(),subject(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7),maildate(),date("") { init(); copy_old(old); odebug << "Copy constructor RecMail" << oendl; } @@ -24,12 +25,13 @@ RecMail::~RecMail() wrapper = 0; } void RecMail::copy_old(const RecMail&old) { subject = old.subject; + maildate = old.maildate; date = old.date; mbox = old.mbox; msg_id = old.msg_id; msg_size = old.msg_size; msg_number = old.msg_number; from = old.from; @@ -50,12 +52,23 @@ void RecMail::init() bcc.clear(); in_reply_to.clear(); references.clear(); wrapper = 0; } +void RecMail::setDate( const QDateTime&a,int offset) +{ + QString timestring = TimeString::numberDateString(a.date())+" "; + timestring+=TimeString::timeString(a.time()); + if (offset > 0) { + timestring.sprintf(timestring+" %+05i",offset); + } + date = timestring; + maildate = a; +} + void RecMail::setWrapper(AbstractMail*awrapper) { wrapper = awrapper; } AbstractMail* RecMail::Wrapper() @@ -393,7 +406,6 @@ folderStat&folderStat::operator=(const folderStat&old) { message_count = old.message_count; message_unseen = old.message_unseen; message_recent = old.message_recent; return *this; } - diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h index c317880..272514c 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.h +++ b/noncore/net/mail/libmailwrapper/mailtypes.h @@ -12,12 +12,13 @@ #include <qbitarray.h> #include <qstring.h> #include <qstringlist.h> #include <qmap.h> #include <qvaluelist.h> +#include <qdatetime.h> class AbstractMail; /* a class to describe mails in a mailbox */ /* Attention! From programmers point of view it would make sense to store the mail body into this class, too. @@ -35,14 +36,12 @@ public: RecMail(); RecMail(const RecMail&old); virtual ~RecMail(); const unsigned int getNumber()const{return msg_number;} void setNumber(unsigned int number){msg_number=number;} - const QString&getDate()const{ return date; } - void setDate( const QString&a ) { date = a; } const QString&getFrom()const{ return from; } void setFrom( const QString&a ) { from = a; } const QString&getSubject()const { return subject; } void setSubject( const QString&s ) { subject = s; } const QString&getMbox()const{return mbox;} void setMbox(const QString&box){mbox = box;} @@ -68,20 +67,26 @@ public: const QBitArray&getFlags()const{return msg_flags;} void setFlags(const QBitArray&flags){msg_flags = flags;} void setWrapper(AbstractMail*wrapper); AbstractMail* Wrapper(); + const QDateTime&getDate()const{ return maildate; } + const QString&getStringDate()const{return date;} + void setDate( const QDateTime&a,int offset=0 ); + protected: - QString subject,date,from,mbox,msg_id,replyto; + QString subject,from,mbox,msg_id,replyto; unsigned int msg_number,msg_size; QBitArray msg_flags; QStringList to,cc,bcc,in_reply_to,references; AbstractMail*wrapper; void init(); void copy_old(const RecMail&old); + QDateTime maildate; + QString date; }; typedef Opie::Core::OSmartPointer<RecMail> RecMailP; typedef QMap<QString,QString> part_plist_t; class RecPart:public Opie::Core::ORefCount |