-rw-r--r-- | noncore/net/mail/imapwrapper.cpp | 7 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp index 7b75ffa..3941cec 100644 --- a/noncore/net/mail/imapwrapper.cpp +++ b/noncore/net/mail/imapwrapper.cpp | |||
@@ -326,18 +326,18 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
326 | mailimap_body*body_desc; | 326 | mailimap_body*body_desc; |
327 | 327 | ||
328 | mb = mail.getMbox().latin1(); | 328 | mb = mail.getMbox().latin1(); |
329 | 329 | ||
330 | login(); | 330 | login(); |
331 | if (!m_imap) { | 331 | if (!m_imap) { |
332 | return body; | 332 | return body; |
333 | } | 333 | } |
334 | /* select mailbox READONLY for operations */ | 334 | |
335 | err = mailimap_examine( m_imap, (char*)mb); | 335 | err = mailimap_select( m_imap, (char*)mb); |
336 | if ( err != MAILIMAP_NO_ERROR ) { | 336 | if ( err != MAILIMAP_NO_ERROR ) { |
337 | qDebug("error selecting mailbox: %s",m_imap->imap_response); | 337 | qDebug("error selecting mailbox: %s",m_imap->imap_response); |
338 | return body; | 338 | return body; |
339 | } | 339 | } |
340 | 340 | ||
341 | result = clist_new(); | 341 | result = clist_new(); |
342 | /* the range has to start at 1!!! not with 0!!!! */ | 342 | /* the range has to start at 1!!! not with 0!!!! */ |
343 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); | 343 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); |
@@ -454,18 +454,17 @@ QString IMAPwrapper::fetchPart(const RecMail&mail,const QValueList<int>&path,boo | |||
454 | clistcell*current,*cur; | 454 | clistcell*current,*cur; |
455 | 455 | ||
456 | login(); | 456 | login(); |
457 | if (!m_imap) { | 457 | if (!m_imap) { |
458 | return body; | 458 | return body; |
459 | } | 459 | } |
460 | if (!internal_call) { | 460 | if (!internal_call) { |
461 | mb = mail.getMbox().latin1(); | 461 | mb = mail.getMbox().latin1(); |
462 | /* select mailbox READONLY for operations */ | 462 | err = mailimap_select( m_imap, (char*)mb); |
463 | err = mailimap_examine( m_imap, (char*)mb); | ||
464 | if ( err != MAILIMAP_NO_ERROR ) { | 463 | if ( err != MAILIMAP_NO_ERROR ) { |
465 | qDebug("error selecting mailbox: %s",m_imap->imap_response); | 464 | qDebug("error selecting mailbox: %s",m_imap->imap_response); |
466 | return body; | 465 | return body; |
467 | } | 466 | } |
468 | } | 467 | } |
469 | set = mailimap_set_new_single(mail.getNumber()); | 468 | set = mailimap_set_new_single(mail.getNumber()); |
470 | clist*id_list=clist_new(); | 469 | clist*id_list=clist_new(); |
471 | for (unsigned j=0; j < path.count();++j) { | 470 | for (unsigned j=0; j < path.count();++j) { |
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 7b75ffa..3941cec 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -326,18 +326,18 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
326 | mailimap_body*body_desc; | 326 | mailimap_body*body_desc; |
327 | 327 | ||
328 | mb = mail.getMbox().latin1(); | 328 | mb = mail.getMbox().latin1(); |
329 | 329 | ||
330 | login(); | 330 | login(); |
331 | if (!m_imap) { | 331 | if (!m_imap) { |
332 | return body; | 332 | return body; |
333 | } | 333 | } |
334 | /* select mailbox READONLY for operations */ | 334 | |
335 | err = mailimap_examine( m_imap, (char*)mb); | 335 | err = mailimap_select( m_imap, (char*)mb); |
336 | if ( err != MAILIMAP_NO_ERROR ) { | 336 | if ( err != MAILIMAP_NO_ERROR ) { |
337 | qDebug("error selecting mailbox: %s",m_imap->imap_response); | 337 | qDebug("error selecting mailbox: %s",m_imap->imap_response); |
338 | return body; | 338 | return body; |
339 | } | 339 | } |
340 | 340 | ||
341 | result = clist_new(); | 341 | result = clist_new(); |
342 | /* the range has to start at 1!!! not with 0!!!! */ | 342 | /* the range has to start at 1!!! not with 0!!!! */ |
343 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); | 343 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); |
@@ -454,18 +454,17 @@ QString IMAPwrapper::fetchPart(const RecMail&mail,const QValueList<int>&path,boo | |||
454 | clistcell*current,*cur; | 454 | clistcell*current,*cur; |
455 | 455 | ||
456 | login(); | 456 | login(); |
457 | if (!m_imap) { | 457 | if (!m_imap) { |
458 | return body; | 458 | return body; |
459 | } | 459 | } |
460 | if (!internal_call) { | 460 | if (!internal_call) { |
461 | mb = mail.getMbox().latin1(); | 461 | mb = mail.getMbox().latin1(); |
462 | /* select mailbox READONLY for operations */ | 462 | err = mailimap_select( m_imap, (char*)mb); |
463 | err = mailimap_examine( m_imap, (char*)mb); | ||
464 | if ( err != MAILIMAP_NO_ERROR ) { | 463 | if ( err != MAILIMAP_NO_ERROR ) { |
465 | qDebug("error selecting mailbox: %s",m_imap->imap_response); | 464 | qDebug("error selecting mailbox: %s",m_imap->imap_response); |
466 | return body; | 465 | return body; |
467 | } | 466 | } |
468 | } | 467 | } |
469 | set = mailimap_set_new_single(mail.getNumber()); | 468 | set = mailimap_set_new_single(mail.getNumber()); |
470 | clist*id_list=clist_new(); | 469 | clist*id_list=clist_new(); |
471 | for (unsigned j=0; j < path.count();++j) { | 470 | for (unsigned j=0; j < path.count();++j) { |