diff options
Diffstat (limited to 'alot')
| -rw-r--r-- | alot/__init__.py | 2 | ||||
| -rw-r--r-- | alot/buffers.py | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/alot/__init__.py b/alot/__init__.py index 83966213..733006c6 100644 --- a/alot/__init__.py +++ b/alot/__init__.py @@ -1,5 +1,5 @@ __productname__ = 'alot' -__version__ = '0.6.0dev' +__version__ = '0.7.0dev' __copyright__ = "Copyright (C) 2012-17 Patrick Totzke" __author__ = "Patrick Totzke" __author_email__ = "patricktotzke@gmail.com" diff --git a/alot/buffers.py b/alot/buffers.py index 6641bd2e..db122aef 100644 --- a/alot/buffers.py +++ b/alot/buffers.py @@ -167,15 +167,11 @@ class EnvelopeBuffer(Buffer): description += ', with key ' elif len(encrypt_keys) > 1: description += ', with keys ' - first_key = True + key_ids = [] for key in encrypt_keys: - if key is not None: - if first_key: - first_key = False - else: - description += ', ' - if len(key.subkeys) > 0: - description += key.uids[0].uid + if key is not None and key.subkeys: + key_ids.append(key.uids[0].uid) + description += ', '.join(key_ids) lines.append(('GPG encrypt', description)) if self.envelope.tags: |