* Removed default_sent_directory(), and introduced

default_mail{_in|_out}_directory() methods in the BPrivate namespace.
* Used these methods in the inbound/outbound protocols.
* Moved WriteMessageFile() into the BPrivate namespace as well, and put its
  prototype into a new header MailPrivate.h along with the new directory
  getters.
* Removed the automatic copy to the sent directory again, and only have one
  directory for incoming mail. Incidentally, this fixed #7509, although the
  underlying filter restriction remains.
* Automatic whitespace cleanups, some style cleanups. Sorry for the mess.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42260 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2011-06-19 22:11:04 +00:00
parent cffd2917a3
commit 21c22141b8
9 changed files with 154 additions and 121 deletions
+10 -14
View File
@@ -20,8 +20,7 @@
class BPath;
typedef enum
{
typedef enum {
B_MAIL_SHOW_STATUS_WINDOW_NEVER = 0,
B_MAIL_SHOW_STATUS_WINDOW_WHEN_SENDING = 1,
B_MAIL_SHOW_STATUS_WINDOW_WHEN_ACTIVE = 2,
@@ -29,8 +28,7 @@ typedef enum
} b_mail_status_window_option;
typedef enum
{
typedef enum {
B_MAIL_STATUS_LOOK_TITLED = 0,
B_MAIL_STATUS_LOOK_NORMAL_BORDER = 1,
B_MAIL_STATUS_LOOK_FLOATING = 2,
@@ -39,9 +37,6 @@ typedef enum
} b_mail_status_window_look;
BString default_sent_directory();
class BMailSettings {
public:
BMailSettings();
@@ -57,7 +52,7 @@ public:
uint32 ShowStatusWindow();
void SetShowStatusWindow(uint32 mode);
bool DaemonAutoStarts();
void SetDaemonAutoStarts(bool does_it);
@@ -91,8 +86,7 @@ private:
};
class AddonSettings
{
class AddonSettings {
public:
AddonSettings();
@@ -106,6 +100,7 @@ public:
BMessage& EditSettings();
bool HasBeenModified();
private:
BMessage fSettings;
entry_ref fAddonRef;
@@ -114,8 +109,7 @@ private:
};
class MailAddonSettings : public AddonSettings
{
class MailAddonSettings : public AddonSettings {
public:
bool Load(const BMessage& message);
bool Save(BMessage& message);
@@ -127,13 +121,13 @@ public:
AddonSettings* FilterSettingsAt(int32 index);
bool HasBeenModified();
private:
std::vector<AddonSettings> fFiltersSettings;
};
class BMailAccountSettings
{
class BMailAccountSettings {
public:
BMailAccountSettings();
BMailAccountSettings(BEntry account);
@@ -176,9 +170,11 @@ class BMailAccountSettings
bool HasBeenModified();
const BEntry& AccountFile();
private:
status_t _CreateAccountFilePath();
private:
status_t fStatus;
BEntry fAccountFile;