i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only delete fully downloaded messages on the server! Clean up a bit.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41092 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2011-03-23 19:13:21 +00:00
parent 6d9f904958
commit a647218ee5
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
+15 -14
View File
@@ -133,6 +133,10 @@ POP3Protocol::Disconnect()
status_t
POP3Protocol::SyncMessages()
{
bool leaveOnServer;
if (fSettings.FindBool("leave_mail_on_server", &leaveOnServer) != B_OK)
leaveOnServer = true;
// create directory if not exist
create_directory(fDestinationDir, 0777);
@@ -211,6 +215,9 @@ POP3Protocol::SyncMessages()
}
NotifyHeaderFetched(ref, &file);
NotifyBodyFetched(ref, &file);
if (!leaveOnServer)
Delete(toRetrieve);
} else {
int32 dummy;
error = mailIO.ReadAt(0, &dummy, 1);
@@ -232,12 +239,6 @@ POP3Protocol::SyncMessages()
// save manifest in case we get disturbed
fManifest += uid;
_WriteManifest();
bool leaveOnServer;
if (fSettings.FindBool("leave_mail_on_server", &leaveOnServer) == B_OK
&& !leaveOnServer) {
Delete(toRetrieve);
}
}
ResetProgress();
@@ -262,7 +263,6 @@ POP3Protocol::FetchBody(const entry_ref& ref)
if (error < B_OK)
return error;
BFile file(&ref, B_READ_WRITE);
status_t status = file.InitCheck();
if (status != B_OK)
@@ -277,14 +277,12 @@ POP3Protocol::FetchBody(const entry_ref& ref)
if (toRetrieve < 0)
return B_NAME_NOT_FOUND;
// TODO: get rid of this BMailMessageIO!
// read header
BMailMessageIO io(this, &file, toRetrieve);
int32 dummy;
status = io.ReadAt(0, &dummy, 1);
if (status < 0)
return status;
bool leaveOnServer;
if (fSettings.FindBool("leave_mail_on_server", &leaveOnServer) != B_OK)
leaveOnServer = true;
// TODO: get rid of this BMailMessageIO!
BMailMessageIO io(this, &file, toRetrieve);
// read body
status = io.Seek(0, SEEK_END);
if (status < 0)
@@ -292,6 +290,9 @@ POP3Protocol::FetchBody(const entry_ref& ref)
NotifyBodyFetched(ref, &file);
if (!leaveOnServer)
Delete(toRetrieve);
ReportProgress(0, 1);
ResetProgress();