summaryrefslogtreecommitdiff
path: root/alot
diff options
context:
space:
mode:
authorpazz <patricktotzke@gmail.com>2011-08-10 21:46:43 +0100
committerpazz <patricktotzke@gmail.com>2011-08-10 21:46:43 +0100
commitde82b268546e54d27ad25291208d50a90eed7449 (patch)
tree21e5508992f17e16b059c6577d6f7e64c6d73fac /alot
parent0addf6c53b912258ad861b81e457257ec1535d76 (diff)
make use of aliases in reply/fwd/completion
issue #62
Diffstat (limited to 'alot')
-rw-r--r--alot/account.py5
-rw-r--r--alot/command.py4
-rw-r--r--alot/completion.py2
3 files changed, 7 insertions, 4 deletions
diff --git a/alot/account.py b/alot/account.py
index ced2c6c4..e4eb04a9 100644
--- a/alot/account.py
+++ b/alot/account.py
@@ -97,5 +97,8 @@ class AccountManager:
return None
# log info
- def get_account_addresses(self):
+ def get_main_addresses(self):
return [a.address for a in self.accounts]
+
+ def get_addresses(self):
+ return self.accountmap.keys()
diff --git a/alot/command.py b/alot/command.py
index 9afb3b2b..025c4891 100644
--- a/alot/command.py
+++ b/alot/command.py
@@ -481,7 +481,7 @@ class ReplyCommand(Command):
reply['Subject'] = Header(subject.encode('utf-8'), 'UTF-8').encode()
# set From
- my_addresses = ui.accountman.get_account_addresses()
+ my_addresses = ui.accountman.get_addresses()
matched_address = ''
in_to = [a for a in my_addresses if a in mail['To']]
if in_to:
@@ -588,7 +588,7 @@ class ForwardCommand(Command):
reply['Subject'] = Header(subject.encode('utf-8'), 'UTF-8').encode()
# set From
- my_addresses = ui.accountman.get_account_addresses()
+ my_addresses = ui.accountman.get_addresses()
matched_address = ''
in_to = [a for a in my_addresses if a in mail['To']]
if in_to:
diff --git a/alot/completion.py b/alot/completion.py
index 2b3709d1..8b235322 100644
--- a/alot/completion.py
+++ b/alot/completion.py
@@ -90,7 +90,7 @@ class AccountCompleter(Completer):
self.accountman = accountman
def complete(self, prefix):
- valids = self.accountman.get_account_addresses()
+ valids = self.accountman.get_main_addresses()
return [a[len(prefix):] for a in valids if a.startswith(prefix)]