GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed getMessages().

Browse Source
This commit is contained in:
Vincent Richard 2005-07-23 13:14:21 +00:00
parent de2431dd0c
commit 81b7b009e9
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -2,6 +2,11 @@
VERSION 0.7.2cvs VERSION 0.7.2cvs
================ ================
2005-07-23 Vincent Richard <vincent@vincent-richard.net>
* POP3, IMAP, maildir: fixed getMessages() when default arguments are given:
no message were returned, instead of the real message count.
2005-07-15 Vincent Richard <vincent@vincent-richard.net> 2005-07-15 Vincent Richard <vincent@vincent-richard.net>
* *attachment, messageParser: added a getName() parameter to retrieve * *attachment, messageParser: added a getName() parameter to retrieve

7
src/messaging/imap/IMAPFolder.cpp
View File

@ -464,12 +464,17 @@ ref <message> IMAPFolder::getMessage(const int num)
std::vector <ref <message> > IMAPFolder::getMessages(const int from, const int to) std::vector <ref <message> > IMAPFolder::getMessages(const int from, const int to)
{ {
const int messageCount = getMessageCount();
const int to2 = (to == -1 ? messageCount : to);
if (!isOpen()) if (!isOpen())
throw exceptions::illegal_state("Folder not open"); throw exceptions::illegal_state("Folder not open");
else if (to2 < from || from < 1 || to2 < 1 || from > messageCount || to2 > messageCount)
throw exceptions::message_not_found();
std::vector <ref <message> > v; std::vector <ref <message> > v;
for (int i = from ; i <= to ; ++i) for (int i = from ; i <= to2 ; ++i)
v.push_back(vmime::create <IMAPMessage>(this, i)); v.push_back(vmime::create <IMAPMessage>(this, i));
return (v); return (v);

6
src/messaging/maildir/maildirFolder.cpp
View File

@ -405,12 +405,16 @@ ref <message> maildirFolder::getMessage(const int num)
std::vector <ref <message> > maildirFolder::getMessages(const int from, const int to) std::vector <ref <message> > maildirFolder::getMessages(const int from, const int to)
{ {
const int to2 = (to == -1 ? m_messageCount : to);
if (!isOpen()) if (!isOpen())
throw exceptions::illegal_state("Folder not open"); throw exceptions::illegal_state("Folder not open");
else if (to2 < from || from < 1 || to2 < 1 || from > m_messageCount || to2 > m_messageCount)
throw exceptions::message_not_found();
std::vector <ref <message> > v; std::vector <ref <message> > v;
for (int i = from ; i <= to ; ++i) for (int i = from ; i <= to2 ; ++i)
{ {
v.push_back(vmime::create <maildirMessage> v.push_back(vmime::create <maildirMessage>
(thisWeakRef().dynamicCast <maildirFolder>(), i)); (thisWeakRef().dynamicCast <maildirFolder>(), i));

6
src/messaging/pop3/POP3Folder.cpp
View File

@ -206,16 +206,18 @@ ref <message> POP3Folder::getMessage(const int num)
std::vector <ref <message> > POP3Folder::getMessages(const int from, const int to) std::vector <ref <message> > POP3Folder::getMessages(const int from, const int to)
{ {
const int to2 = (to == -1 ? m_messageCount : to);
if (!m_store) if (!m_store)
throw exceptions::illegal_state("Store disconnected"); throw exceptions::illegal_state("Store disconnected");
else if (!isOpen()) else if (!isOpen())
throw exceptions::illegal_state("Folder not open"); throw exceptions::illegal_state("Folder not open");
else if (to < from || from < 1 || to < 1 || from > m_messageCount || to > m_messageCount) else if (to2 < from || from < 1 || to2 < 1 || from > m_messageCount || to2 > m_messageCount)
throw exceptions::message_not_found(); throw exceptions::message_not_found();
std::vector <ref <message> > v; std::vector <ref <message> > v;
for (int i = from ; i <= to ; ++i) for (int i = from ; i <= to2 ; ++i)
v.push_back(vmime::create <POP3Message>(this, i)); v.push_back(vmime::create <POP3Message>(this, i));
return (v); return (v);