diff options
Diffstat (limited to 'src/leap/bitmask')
| -rw-r--r-- | src/leap/bitmask/backend/components.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mail_status.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index d4f6d176..50f723cb 100644 --- a/src/leap/bitmask/backend/components.py +++ b/src/leap/bitmask/backend/components.py @@ -914,6 +914,8 @@ class Keymanager(object): keymanager = self._keymanager_proxy try: + # NOTE: parse_openpgp_ascii_key is not in keymanager anymore + # the API for that will need some thinking public_key, private_key = keymanager.parse_openpgp_ascii_key( new_key) except (KeyAddressMismatch, KeyFingerprintMismatch) as e: @@ -974,7 +976,7 @@ class Keymanager(object): """ List all the keys stored in the local DB. """ - keys = self._keymanager_proxy.get_all_keys_in_local_db() + keys = self._keymanager_proxy.get_all_keys() self._signaler.signal(self._signaler.keymanager_keys_list, keys) def get_key_details(self, username): diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py index d523f449..92e1e4c4 100644 --- a/src/leap/bitmask/gui/mail_status.py +++ b/src/leap/bitmask/gui/mail_status.py @@ -228,7 +228,7 @@ class MailStatusWidget(QtGui.QWidget): self._service_name)) elif ready == 1: icon = self.CONNECTING_ICON - self._mx_status = self.tr('Starting…') + self._mx_status = self.tr('Starting...') tray_status = self.tr('Mail is starting') elif ready >= 2: icon = self.CONNECTED_ICON |