summaryrefslogtreecommitdiff
path: root/noncore/net/mail/libmailwrapper
Unidiff
Diffstat (limited to 'noncore/net/mail/libmailwrapper') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/libmailwrapper/pop3wrapper.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index ec4dcd2..cceb22e 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -36,29 +36,29 @@ void POP3wrapper::pop3_progress( size_t current, size_t maximum )
36 36
37RecBody POP3wrapper::fetchBody( const RecMail &mail ) 37RecBody POP3wrapper::fetchBody( const RecMail &mail )
38{ 38{
39 int err = MAILPOP3_NO_ERROR; 39 int err = MAILPOP3_NO_ERROR;
40 char *message = 0; 40 char *message = 0;
41 size_t length = 0; 41 size_t length = 0;
42 42
43 login(); 43 login();
44 if ( !m_pop3 ) { 44 if ( !m_pop3 ) {
45 return RecBody(); 45 return RecBody();
46 } 46 }
47 47
48 RecBody body; 48 RecBody body;
49 mailmessage * mailmsg; 49 mailmessage * mailmsg;
50 if (mail.Msgsize()>HARD_MSG_SIZE_LIMIT) { 50 if (mail.Msgsize()>HARD_MSG_SIZE_LIMIT) {
51 qDebug("Message to large: %i",mail.Msgsize()); 51 qDebug("Message to large: %i",mail.Msgsize());
52 return body; 52 return body;
53 } 53 }
54 54
55 QFile msg_cache(msgTempName); 55 QFile msg_cache(msgTempName);
56 56
57 cleanMimeCache(); 57 cleanMimeCache();
58 58
59 if (mail.getNumber()!=last_msg_id) { 59 if (mail.getNumber()!=last_msg_id) {
60 if (msg_cache.exists()) { 60 if (msg_cache.exists()) {
61 msg_cache.remove(); 61 msg_cache.remove();
62 } 62 }
63 msg_cache.open(IO_ReadWrite|IO_Truncate); 63 msg_cache.open(IO_ReadWrite|IO_Truncate);
64 last_msg_id = mail.getNumber(); 64 last_msg_id = mail.getNumber();
@@ -85,17 +85,17 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail )
85 msg_data = (generic_message_t *)mailmsg->msg_data; 85 msg_data = (generic_message_t *)mailmsg->msg_data;
86 msg_data->msg_fetched = 1; 86 msg_data->msg_fetched = 1;
87 msg_data->msg_message = message; 87 msg_data->msg_message = message;
88 msg_data->msg_length = strlen(message); 88 msg_data->msg_length = strlen(message);
89 } 89 }
90 body = parseMail(mailmsg); 90 body = parseMail(mailmsg);
91 91
92 /* clean up */ 92 /* clean up */
93 if (mailmsg) mailmessage_free(mailmsg); 93 if (mailmsg) mailmessage_free(mailmsg);
94 if (message) free(message); 94 if (message) free(message);
95 95
96 return body; 96 return body;
97} 97}
98 98
99void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) 99void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
100{ 100{
101 login(); 101 login();
@@ -150,12 +150,13 @@ void POP3wrapper::login()
150 mailstorage_free(m_pop3); 150 mailstorage_free(m_pop3);
151 m_pop3 = NULL; 151 m_pop3 = NULL;
152 return; 152 return;
153 } 153 }
154 err = mailfolder_connect(m_folder); 154 err = mailfolder_connect(m_folder);
155 if (err != MAIL_NO_ERROR) { 155 if (err != MAIL_NO_ERROR) {
156 qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) );
156 Global::statusMessage(tr("Error initializing folder")); 157 Global::statusMessage(tr("Error initializing folder"));
157 mailfolder_free(m_folder); 158 mailfolder_free(m_folder);
158 m_folder = 0; 159 m_folder = 0;
159 mailstorage_free(m_pop3); 160 mailstorage_free(m_pop3);
160 m_pop3 = 0; 161 m_pop3 = 0;
161 } 162 }
@@ -211,13 +212,13 @@ int POP3wrapper::deleteAllMail(const Folder*)
211 err = mailsession_remove_message(m_folder->fld_session,i+1); 212 err = mailsession_remove_message(m_folder->fld_session,i+1);
212 if (err != MAIL_NO_ERROR) { 213 if (err != MAIL_NO_ERROR) {
213 Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); 214 Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
214 res=0; 215 res=0;
215 } 216 }
216 break; 217 break;
217 } 218 }
218 return res; 219 return res;
219} 220}
220 221
221void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) 222void POP3wrapper::statusFolder(folderStat&target_stat,const QString&)
222{ 223{
223 login(); 224 login();
@@ -234,13 +235,13 @@ encodedString* POP3wrapper::fetchRawBody(const RecMail&mail)
234 char*target=0; 235 char*target=0;
235 size_t length=0; 236 size_t length=0;
236 encodedString*res = 0; 237 encodedString*res = 0;
237 mailmessage * mailmsg = 0; 238 mailmessage * mailmsg = 0;
238 int err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg); 239 int err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg);
239 err = mailmessage_fetch(mailmsg,&target,&length); 240 err = mailmessage_fetch(mailmsg,&target,&length);
240 if (mailmsg) mailmessage_free(mailmsg); 241 if (mailmsg) mailmessage_free(mailmsg);
241 if (target) { 242 if (target) {
242 res = new encodedString(target,length); 243 res = new encodedString(target,length);
243 } 244 }
244 return res; 245 return res;
245} 246}
246 247