From f409450998b92c812f704c674aea867d3caf8c69 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sat, 1 Dec 2007 13:22:39 +0000 Subject: [PATCH] re-create gpg instance in connection.py at each connection son use_gpg_agent current value of use_gpg_agent option is used warn user when he configured gajim to use gpg-agent but it returns a wrong passphrase. see #3592 --- src/common/connection.py | 2 +- src/gajim.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/common/connection.py b/src/common/connection.py index 55d6d6627..aeeae5ee6 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -767,7 +767,7 @@ class Connection(ConnectionHandlers): safe_substitute({ 'hostname': socket.gethostname() }) - if USE_GPG and not self.gpg: + if USE_GPG: self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) self.connect_and_init(show, msg, sign_msg) diff --git a/src/gajim.py b/src/gajim.py index 6ca85d454..fa8c4e88c 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -1371,13 +1371,16 @@ class Interface: return False def handle_event_bad_passphrase(self, account, array): + #('BAD_PASSPHRASE', account, ()) use_gpg_agent = gajim.config.get('use_gpg_agent') + sectext = '' if use_gpg_agent: - return + sectext = _('You configured Gajim to use GPG agent, but there is no ' + 'GPG agent running or it returned a wrong passphrase.\n') + sectext += _('You are currently connected without your OpenPGP key.') keyID = gajim.config.get_per('accounts', account, 'keyid') self.forget_gpg_passphrase(keyID) - dialogs.WarningDialog(_('Your passphrase is incorrect'), - _('You are currently connected without your OpenPGP key.')) + dialogs.WarningDialog(_('Your passphrase is incorrect'), sectext) def handle_event_gpg_password_required(self, account, array): #('GPG_PASSWORD_REQUIRED', account, (callback,))