changeset e23d3603521f in /home/hg/repos/gajim
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=e23d3603521f
description: read assigned GPG key when creating the contacts. fixes: #7111
diffstat:
src/gui_interface.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diffs (19 lines):
diff -r 3a8a6f07b98e -r e23d3603521f src/gui_interface.py
--- a/src/gui_interface.py Tue Jul 16 18:03:58 2013 +0200
+++ b/src/gui_interface.py Tue Jul 16 18:28:17 2013 +0200
@@ -773,9 +773,14 @@
if obj.sub == 'remove':
return
# Add new contact to roster
+ keyID = ''
+ attached_keys = gajim.config.get_per('accounts', account,
+ 'attached_gpg_keys').split()
+ if obj.jid in attached_keys:
+ keyID = attached_keys[attached_keys.index(obj.jid) + 1]
contact = gajim.contacts.create_contact(jid=obj.jid,
account=account, name=obj.nickname, groups=obj.groups,
- show='offline', sub=obj.sub, ask=obj.ask)
+ show='offline', sub=obj.sub, ask=obj.ask, keyID=keyID)
gajim.contacts.add_contact(account, contact)
self.roster.add_contact(obj.jid, account)
else:
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
