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

details:http://hg.gajim.org/gajim?cmd=changeset;node=4a0392615d81 description: don't override assigned GPG key. Fixes #7111

diffstat:

src/common/connection_handlers.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 3b47eed7ab33 -r 4a0392615d81 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Feb 21 10:12:26 2012 +0100 +++ b/src/common/connection_handlers.py Tue Feb 21 23:53:49 2012 +0100 @@ -893,7 +893,13 @@ obj.contact.show = obj.show obj.contact.status = obj.status obj.contact.priority = obj.prio - obj.contact.keyID = obj.keyID + attached_keys = gajim.config.get_per('accounts', account, + 'attached_gpg_keys').split() + if jid in attached_keys: + obj.contact.keyID = attached_keys[attached_keys.index(jid) + 1] + else: + # Do not override assigned key + obj.contact.keyID = obj.keyID if obj.timestamp: obj.contact.last_status_time = obj.timestamp elif not gajim.block_signed_in_notifications[account]: