diff options
| author | Florent Le Coz <louiz@louiz.org> | 2012-02-15 20:10:00 +0100 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2012-02-15 20:10:00 +0100 |
| commit | 695a7ebebaf6a277420dcb42cd96d92d77df0379 (patch) | |
| tree | 8c9da1e5bf988356ad110f42113949aab94a5866 /plugins/gpg/__init__.py | |
| parent | 0606c2b351ac87f110e1240d2f4ba1b94b275930 (diff) | |
| parent | b89cd8fd8322bf8aa23130398a0a70defcba708d (diff) | |
| download | poezio-695a7ebebaf6a277420dcb42cd96d92d77df0379.tar.gz poezio-695a7ebebaf6a277420dcb42cd96d92d77df0379.tar.bz2 poezio-695a7ebebaf6a277420dcb42cd96d92d77df0379.tar.xz poezio-695a7ebebaf6a277420dcb42cd96d92d77df0379.zip | |
Merge branch 'master' of https://git.louiz.org/poezio
Diffstat (limited to 'plugins/gpg/__init__.py')
| -rw-r--r-- | plugins/gpg/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/gpg/__init__.py b/plugins/gpg/__init__.py index 01ca6ab2..00d896cd 100644 --- a/plugins/gpg/__init__.py +++ b/plugins/gpg/__init__.py @@ -158,7 +158,6 @@ class Plugin(BasePlugin): if jid.full not in self.contacts.keys(): return '' status = self.contacts[jid.full] - self.core.information('%s' % (status,)) if status in ('valid', 'invalid', 'signed'): return ' GPG Key: %s (%s)' % (status, 'encrypted' if status == 'valid' else 'NOT encrypted',) else: @@ -176,6 +175,8 @@ class Plugin(BasePlugin): else: if isinstance(self.core.current_tab(), ConversationTab): jid = JID(self.core.current_tab().get_name()) + else: + return command = args[0] if command == 'force' or command == 'enable': # we can force encryption only with contact having an associated |