changeset 4b54c0c10d50 in /home/hg/repos/gajim

branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4b54c0c10d50 description: fix using GPG with non-utf8 OS. Fixes #7227

diffstat:

src/common/connection.py | 3 ++- src/common/gpg.py | 1 - 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r a195b62410d9 -r 4b54c0c10d50 src/common/connection.py --- a/src/common/connection.py Thu Jun 20 20:47:42 2013 +0200 +++ b/src/common/connection.py Thu Jun 20 20:48:34 2013 +0200 @@ -294,7 +294,8 @@ else: def encrypt_thread(msg, keyID, always_trust=False): # encrypt message. This function returns (msgenc, error) - return self.gpg.encrypt(msg, [keyID], always_trust) + return self.gpg.encrypt(msg, [keyID], + always_trust) def _on_encrypted(output): msgenc, error = output if error == 'NOT_TRUSTED': diff -r a195b62410d9 -r 4b54c0c10d50 src/common/gpg.py --- a/src/common/gpg.py Thu Jun 20 20:47:42 2013 +0200 +++ b/src/common/gpg.py Thu Jun 20 20:48:34 2013 +0200 @@ -31,7 +31,6 @@ class GnuPG(gnupg.GPG): def __init__(self, use_agent=False): gnupg.GPG.__init__(self) - gnupg.GPG.decode_errors = 'replace' self.passphrase = None self.use_agent = use_agent self.always_trust = False