author | alwin <alwin> | 2003-12-28 02:45:07 (UTC) |
---|---|---|
committer | alwin <alwin> | 2003-12-28 02:45:07 (UTC) |
commit | d1a7eb08cad465c5fc0de53f75aaecf7803f0945 (patch) (unidiff) | |
tree | 422b73af760cdd44e4fbbc96bd6876a15939ff19 /noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |
parent | e889485e945d8fa9564566f286114be10d2a1ce5 (diff) | |
download | opie-d1a7eb08cad465c5fc0de53f75aaecf7803f0945.zip opie-d1a7eb08cad465c5fc0de53f75aaecf7803f0945.tar.gz opie-d1a7eb08cad465c5fc0de53f75aaecf7803f0945.tar.bz2 |
- dir handling for mbox accounts (delete, new, delete all mail)
- fixed memory leaks in mbox account class
- reduced count of used string constants while using "tr" with context string
- mbox displays messages into global status bar
- fixed a possible raise condition when deleting a mail directory
Diffstat (limited to 'noncore/net/mail/libmailwrapper/pop3wrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index efd83ba..b85fbf6 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |||
@@ -1,19 +1,18 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include "pop3wrapper.h" | 2 | #include "pop3wrapper.h" |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
4 | #include "logindialog.h" | 4 | #include "logindialog.h" |
5 | #include <libetpan/mailpop3.h> | 5 | #include <libetpan/libetpan.h> |
6 | #include <libetpan/mailmime.h> | 6 | #include <qpe/global.h> |
7 | #include <libetpan/data_message_driver.h> | ||
8 | #include <qfile.h> | 7 | #include <qfile.h> |
9 | 8 | ||
10 | /* we don't fetch messages larger than 5 MB */ | 9 | /* we don't fetch messages larger than 5 MB */ |
11 | #define HARD_MSG_SIZE_LIMIT 5242880 | 10 | #define HARD_MSG_SIZE_LIMIT 5242880 |
12 | 11 | ||
13 | POP3wrapper::POP3wrapper( POP3account *a ) | 12 | POP3wrapper::POP3wrapper( POP3account *a ) |
14 | : Genericwrapper() | 13 | : Genericwrapper() |
15 | { | 14 | { |
16 | account = a; | 15 | account = a; |
17 | m_pop3 = NULL; | 16 | m_pop3 = NULL; |
18 | msgTempName = a->getFileName()+"_msg_cache"; | 17 | msgTempName = a->getFileName()+"_msg_cache"; |
19 | last_msg_id = 0; | 18 | last_msg_id = 0; |
@@ -103,44 +102,46 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) | |||
103 | } | 102 | } |
104 | 103 | ||
105 | void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) | 104 | void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) |
106 | { | 105 | { |
107 | int err = MAILPOP3_NO_ERROR; | 106 | int err = MAILPOP3_NO_ERROR; |
108 | char * header = 0; | 107 | char * header = 0; |
109 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ | 108 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ |
110 | size_t length = 0; | 109 | size_t length = 0; |
111 | carray * messages = 0; | 110 | carray * messages = 0; |
112 | 111 | ||
113 | login(); | 112 | login(); |
114 | if (!m_pop3) return; | 113 | if (!m_pop3) return; |
114 | |||
115 | mailpop3_list( m_pop3, &messages ); | 115 | mailpop3_list( m_pop3, &messages ); |
116 | 116 | ||
117 | for (unsigned int i = 0; i < carray_count(messages);++i) { | 117 | for (unsigned int i = 0; i < carray_count(messages);++i) { |
118 | mailpop3_msg_info *info; | 118 | mailpop3_msg_info *info; |
119 | err = mailpop3_get_msg_info(m_pop3,i+1,&info); | 119 | err = mailpop3_get_msg_info(m_pop3,i+1,&info); |
120 | if (info->msg_deleted) | 120 | if (info->msg_deleted) |
121 | continue; | 121 | continue; |
122 | err = mailpop3_header( m_pop3, info->msg_index, &header, &length ); | 122 | err = mailpop3_header( m_pop3, info->msg_index, &header, &length ); |
123 | if ( err != MAILPOP3_NO_ERROR ) { | 123 | if ( err != MAILPOP3_NO_ERROR ) { |
124 | qDebug( "POP3: error retrieving header msgid: %i", info->msg_index ); | 124 | qDebug( "POP3: error retrieving header msgid: %i", info->msg_index ); |
125 | free(header); | 125 | free(header); |
126 | return; | 126 | return; |
127 | } | 127 | } |
128 | RecMail *mail = parseHeader( header ); | 128 | RecMail *mail = parseHeader( header ); |
129 | mail->setNumber( info->msg_index ); | 129 | mail->setNumber( info->msg_index ); |
130 | mail->setWrapper(this); | 130 | mail->setWrapper(this); |
131 | mail->setMsgsize(info->msg_size); | 131 | mail->setMsgsize(info->msg_size); |
132 | target.append( mail ); | 132 | target.append( mail ); |
133 | free(header); | 133 | free(header); |
134 | } | 134 | } |
135 | Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(carray_count(messages)-m_pop3->pop3_deleted_count)); | ||
135 | } | 136 | } |
136 | 137 | ||
137 | void POP3wrapper::login() | 138 | void POP3wrapper::login() |
138 | { | 139 | { |
139 | /* we'll hold the line */ | 140 | /* we'll hold the line */ |
140 | if ( m_pop3 != NULL ) return; | 141 | if ( m_pop3 != NULL ) return; |
141 | 142 | ||
142 | const char *server, *user, *pass; | 143 | const char *server, *user, *pass; |
143 | uint16_t port; | 144 | uint16_t port; |
144 | int err = MAILPOP3_NO_ERROR; | 145 | int err = MAILPOP3_NO_ERROR; |
145 | 146 | ||
146 | server = account->getServer().latin1(); | 147 | server = account->getServer().latin1(); |