From ba11c28b6b0071d9bc6104c4945c431c204ac446 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Mon, 21 Feb 2011 07:19:24 +0000 Subject: [PATCH] Fix crash in imap config view. Remove hard coded path. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40592 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../inbound_protocols/imap/imap_config.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_config.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_config.cpp index 9d35c26574..95f0539ef7 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_config.cpp +++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_config.cpp @@ -11,6 +11,8 @@ #include #include +#include +#include #include #include @@ -60,8 +62,8 @@ IMAPConfig::IMAPConfig(MailAddonSettings& settings, SetTo(settings); - ((BControl *)(FindView("leave_mail_remote")))->SetValue(B_CONTROL_ON); - ((BControl *)(FindView("leave_mail_remote")))->Hide(); + ((BControl *)(FindView("leave_mail_on_server")))->SetValue(B_CONTROL_ON); + ((BControl *)(FindView("leave_mail_on_server")))->Hide(); BRect frame = FindView("delete_remote_when_local")->Frame(); @@ -75,10 +77,15 @@ IMAPConfig::IMAPConfig(MailAddonSettings& settings, frame.right -= 10; - BString defaultFolder = "/boot/home/mail/"; - defaultFolder += accountSettings.Name(); + BPath defaultFolder; + if (find_directory(B_USER_DIRECTORY, &defaultFolder) == B_OK) + defaultFolder.Append("mail"); + else + defaultFolder.SetTo("/boot/home/mail/"); + defaultFolder.Append(accountSettings.Name()); + fFileView = new BMailFileConfigView("Destination:", "destination", - false, defaultFolder); + false, defaultFolder.Path()); fFileView->SetTo(&settings.Settings(), NULL); AddChild(fFileView); fFileView->MoveBy(0, frame.bottom + 5);