summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/libmailwrapper/genericwrapper.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
index 3e4293b..1caa375 100644
--- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
@@ -137,7 +137,7 @@ QString Genericwrapper::getencoding(mailmime_mechanism*aEnc)
137void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count) 137void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count)
138{ 138{
139 if (current_rec >= 10) { 139 if (current_rec >= 10) {
140 odebug << "too deep recursion!" << oendl; 140 odebug << "too deep recursion!" << oendl;
141 } 141 }
142 if (!message || !mime) { 142 if (!message || !mime) {
143 return; 143 return;
@@ -274,7 +274,7 @@ QString Genericwrapper::parseAddressList( mailimf_address_list *list )
274 result.append( parseGroup( addr->ad_data.ad_group ) ); 274 result.append( parseGroup( addr->ad_data.ad_group ) );
275 break; 275 break;
276 default: 276 default:
277 odebug << "Generic: unkown mailimf address type" << oendl; 277 odebug << "Generic: unkown mailimf address type" << oendl;
278 break; 278 break;
279 } 279 }
280 } 280 }
@@ -367,7 +367,7 @@ void Genericwrapper::cleanMimeCache()
367 if (t) delete t; 367 if (t) delete t;
368 } 368 }
369 bodyCache.clear(); 369 bodyCache.clear();
370 odebug << "Genericwrapper: cache cleaned" << oendl; 370 odebug << "Genericwrapper: cache cleaned" << oendl;
371} 371}
372 372
373QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies) 373QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies)
@@ -396,12 +396,12 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
396 mailmessage_list * env_list = 0; 396 mailmessage_list * env_list = 0;
397 r = mailsession_get_messages_list(session,&env_list); 397 r = mailsession_get_messages_list(session,&env_list);
398 if (r != MAIL_NO_ERROR) { 398 if (r != MAIL_NO_ERROR) {
399 odebug << "Error message list" << oendl; 399 odebug << "Error message list" << oendl;
400 return; 400 return;
401 } 401 }
402 r = mailsession_get_envelopes_list(session, env_list); 402 r = mailsession_get_envelopes_list(session, env_list);
403 if (r != MAIL_NO_ERROR) { 403 if (r != MAIL_NO_ERROR) {
404 odebug << "Error filling message list" << oendl; 404 odebug << "Error filling message list" << oendl;
405 if (env_list) { 405 if (env_list) {
406 mailmessage_list_free(env_list); 406 mailmessage_list_free(env_list);
407 } 407 }
@@ -415,7 +415,7 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
415 QBitArray mFlags(7); 415 QBitArray mFlags(7);
416 msg = (mailmessage*)carray_get(env_list->msg_tab, i); 416 msg = (mailmessage*)carray_get(env_list->msg_tab, i);
417 if (msg->msg_fields == NULL) { 417 if (msg->msg_fields == NULL) {
418 //odebug << "could not fetch envelope of message " << i << "" << oendl; 418 //odebug << "could not fetch envelope of message " << i << "" << oendl;
419 continue; 419 continue;
420 } 420 }
421 RecMailP mail = new RecMail(); 421 RecMailP mail = new RecMail();
@@ -448,9 +448,8 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
448 if (single_fields.fld_orig_date) 448 if (single_fields.fld_orig_date)
449 mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) ); 449 mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) );
450 // crashes when accessing pop3 account? 450 // crashes when accessing pop3 account?
451 if (single_fields.fld_message_id->mid_value) { 451 if (single_fields.fld_message_id && single_fields.fld_message_id->mid_value) {
452 mail->setMsgid(QString(single_fields.fld_message_id->mid_value)); 452 mail->setMsgid(QString(single_fields.fld_message_id->mid_value));
453 odebug << "Msgid == " << mail->Msgid().latin1() << "" << oendl;
454 } 453 }
455 454
456 if (single_fields.fld_reply_to) { 455 if (single_fields.fld_reply_to) {