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

Don't send a mail entry located in trash folder.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39804 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2010-12-10 14:43:44 +00:00
parent dfc6cf0159
commit 1e4538de6f
1 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/mail/main.cpp
+45 -14
View File
@@ -10,23 +10,24 @@
#include <Application.h> #include <Application.h>
#include <Message.h>
#include <File.h>
#include <MessageRunner.h>
#include <Deskbar.h>
#include <Roster.h>
#include <Button.h>
#include <StringView.h>
#include <Mime.h>
#include <Beep.h> #include <Beep.h>
#include <Button.h>
#include <ChainRunner.h>
#include <Deskbar.h>
#include <File.h>
#include <FindDirectory.h>
#include <fs_index.h> #include <fs_index.h>
#include <fs_info.h> #include <fs_info.h>
#include <String.h> #include <Message.h>
#include <VolumeRoster.h> #include <MessageRunner.h>
#include <Query.h> #include <Mime.h>
#include <ChainRunner.h>
#include <NodeMonitor.h> #include <NodeMonitor.h>
#include <Path.h> #include <Path.h>
#include <Query.h>
#include <Roster.h>
#include <String.h>
#include <StringView.h>
#include <VolumeRoster.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@@ -78,7 +79,8 @@ public:
private: private:
void _UpdateAutoCheck(bigtime_t interval); void _UpdateAutoCheck(bigtime_t interval);
bool _IsPending(BNode& entry) const; static bool _IsPending(BNode& node);
static bool _IsEntryInTrash(BEntry& entry);
private: private:
BMessageRunner* fAutoCheckRunner; BMessageRunner* fAutoCheckRunner;
@@ -515,6 +517,9 @@ MailDaemonApp::SendPendingMessages(BMessage* msg)
off_t size; off_t size;
while (query.GetNextEntry(&entry) == B_OK) { while (query.GetNextEntry(&entry) == B_OK) {
if (_IsEntryInTrash(entry))
continue;
while (node.SetTo(&entry) == B_BUSY) while (node.SetTo(&entry) == B_BUSY)
snooze(1000); snooze(1000);
if (!_IsPending(node)) if (!_IsPending(node))
@@ -560,6 +565,9 @@ MailDaemonApp::SendPendingMessages(BMessage* msg)
off_t size; off_t size;
while (query.GetNextEntry(&entry) == B_OK) { while (query.GetNextEntry(&entry) == B_OK) {
if (_IsEntryInTrash(entry))
continue;
node.SetTo(&entry); node.SetTo(&entry);
if (!_IsPending(node)) if (!_IsPending(node))
continue; continue;
@@ -606,8 +614,10 @@ MailDaemonApp::Pulse()
/*! Work-around for a broken index that contains out-of-date information. /*! Work-around for a broken index that contains out-of-date information.
*/ */
/* static */
bool bool
MailDaemonApp::_IsPending(BNode& node) const MailDaemonApp::_IsPending(BNode& node)
{ {
int32 flags; int32 flags;
if (node.ReadAttr(B_MAIL_ATTR_FLAGS, B_INT32_TYPE, 0, &flags, sizeof(int32)) if (node.ReadAttr(B_MAIL_ATTR_FLAGS, B_INT32_TYPE, 0, &flags, sizeof(int32))
@@ -618,6 +628,27 @@ MailDaemonApp::_IsPending(BNode& node) const
} }
/* static */
bool
MailDaemonApp::_IsEntryInTrash(BEntry& entry)
{
entry_ref ref;
entry.GetRef(&ref);
BPath trashPath;
BPath entryPath(&entry);
BVolume volume(ref.device);
if (volume.InitCheck() == B_OK) {
find_directory(B_TRASH_DIRECTORY, &trashPath, false, &volume);
if (strncmp(entryPath.Path(), trashPath.Path(),
strlen(trashPath.Path())) == 0)
return true;
}
return false;
}
// #pragma mark - // #pragma mark -