From 6a400ee80f3e45607a8f4b2ca823570a93c4dc24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= Date: Sat, 19 Sep 2009 23:33:20 +0000 Subject: [PATCH] Move mailbox symlink from ~/mail/mailbox to ~/config/settings/Mail/mailbox as requested in #4580. Create in/out/draft folders at build time. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33199 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 6 ++++++ src/apps/mail/MailSupport.cpp | 2 +- src/servers/mail/DeskbarView.cpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 40bf1f2b5f..6af2c01bc7 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -291,6 +291,12 @@ AddSymlinkToHaikuImage system bin : trash : untrash ; AddSymlinkToHaikuImage home Desktop : /boot/home : Home ; +# Mailbox folders and symlink +AddDirectoryToHaikuImage home mail drafts ; +AddDirectoryToHaikuImage home mail in ; +AddDirectoryToHaikuImage home mail out ; +AddSymlinkToHaikuImage home config settings Mail : ../../../mail/in : mailbox ; + # Deskbar Application links AddDirectoryToHaikuImage home config be Applications ; DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc diff --git a/src/apps/mail/MailSupport.cpp b/src/apps/mail/MailSupport.cpp index 57c8beb84c..55aff05f86 100644 --- a/src/apps/mail/MailSupport.cpp +++ b/src/apps/mail/MailSupport.cpp @@ -93,7 +93,7 @@ const char* kSpamServerSignature = const char* kDraftPath = "mail/draft"; const char* kDraftType = "text/x-vnd.Be-MailDraft"; const char* kMailFolder = "mail"; -const char* kMailboxFolder = "mail/mailbox"; +const char* kMailboxFolder = "config/settings/Mail/mailbox"; int32 diff --git a/src/servers/mail/DeskbarView.cpp b/src/servers/mail/DeskbarView.cpp index 2bebafaa13..8632d4f638 100644 --- a/src/servers/mail/DeskbarView.cpp +++ b/src/servers/mail/DeskbarView.cpp @@ -344,7 +344,7 @@ void DeskbarView::MouseUp(BPoint pos) { if (fLastButtons & B_PRIMARY_MOUSE_BUTTON) { - if (OpenFolder("mail/mailbox") != B_OK + if (OpenFolder("config/settings/Mail/mailbox") != B_OK && OpenFolder("mail/in") != B_OK && OpenFolder("mail/INBOX") != B_OK) OpenFolder("mail");