Merge branch 'master' into next

[sup] / lib / sup.rb

diff --git a/lib/sup.rb b/lib/sup.rb
index 96510b2e2d7419629a0a3fd3e9d96eafca29c36e..4f59eaaf13caf6f1c5187af73bc7f4b26201a24b 100644 (file)
--- a/lib/sup.rb
+++ b/lib/sup.rb
@@ -101,7 +101,7 @@ module Redwood
   end
 
   def start
-    Redwood::SentManager.new Redwood::SENT_FN
+    Redwood::SentManager.new $config[:sent_source] || 'sup://sent'
     Redwood::ContactManager.new Redwood::CONTACT_FN
     Redwood::LabelManager.new Redwood::LABEL_FN
     Redwood::AccountManager.new $config[:accounts]
@@ -207,6 +207,7 @@ else
     :confirm_top_posting => true,
     :discard_snippets_from_encrypted_messages => false,
     :default_attachment_save_dir => "",
+    :sent_source => "sup://sent"
   }
   begin
     FileUtils.mkdir_p Redwood::BASE_DIR