sup

commit 1e16892c0d3fe66d206ed805d283649e8396751d
parent 6bc5fac5b9321acacce27a93f30e576d343b1ee5
Author: Damien Leone <damien.leone@fensalir.fr>
Date:   Fri, 14 May 2010 13:34:09 +0200

Make it easier to select the from address with the ask_for_from option

Diffstat:

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb
@@ -558,9 +558,9 @@ EOS
   end
 
   def ask_for_account domain, question
-    default = AccountManager.default_account.email
     completions = AccountManager.user_emails
-    answer = BufferManager.ask_many_emails_with_completions domain, question, completions, default
+    answer = BufferManager.ask_many_emails_with_completions domain, question, completions, ""
+    answer = AccountManager.default_account.email if answer == ""
     AccountManager.account_for Person.from_address(answer).email if answer
   end
 
diff --git a/lib/sup/modes/compose-mode.rb b/lib/sup/modes/compose-mode.rb
@@ -21,7 +21,7 @@ class ComposeMode < EditMessageMode
   end
 
   def self.spawn_nicely opts={}
-    from = opts[:from] || (BufferManager.ask_for_account(:account, "From: ") or return if $config[:ask_for_from])
+    from = opts[:from] || (BufferManager.ask_for_account(:account, "From (default #{AccountManager.default_account.email}): ") or return if $config[:ask_for_from])
     to = opts[:to] || (BufferManager.ask_for_contacts(:people, "To: ", [opts[:to_default]]) or return if ($config[:ask_for_to] != false))
     cc = opts[:cc] || (BufferManager.ask_for_contacts(:people, "Cc: ") or return if $config[:ask_for_cc])
     bcc = opts[:bcc] || (BufferManager.ask_for_contacts(:people, "Bcc: ") or return if $config[:ask_for_bcc])