changeset 7946575b0726 in /home/hg/repos/gajim
author: Yann Leboulanger <aste...@lagaule.org>
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=7946575b0726
description: [moparisthebest] Encrypt GPG message to recipient and to our own
key so that we can decrypt it later and use carbon. Fixes #7616
diffstat:
src/common/connection.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (25 lines):
diff -r c67a57b9f754 -r 7946575b0726 src/common/connection.py
--- a/src/common/connection.py Mon Jul 13 15:42:33 2015 +0200
+++ b/src/common/connection.py Mon Jul 13 21:39:12 2015 +0200
@@ -313,9 +313,11 @@
error = _('The contact\'s key (%s) does not match the key
assigned '
'in Gajim.' % keyID[:8])
else:
+ myKeyID = gajim.config.get_per('accounts', self.name, 'keyid')
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, myKeyID],
+ always_trust)
def _on_encrypted(output):
msgenc, error = output
if error == 'NOT_TRUSTED':
@@ -423,8 +425,6 @@
if msgenc:
msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc)
- if self.carbons_enabled:
- msg_iq.addChild(name='private', namespace=nbxmpp.NS_CARBONS)
msg_iq.addChild(name='no-permanent-storage',
namespace=nbxmpp.NS_MSG_HINTS)
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
