changeset a27c12733243 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=a27c12733243
description: prevent traceback when we receive a message archiving negotiation
while our server doesn't support message archiving. Fixes #5859
diffstat:
src/common/message_archiving.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diffs (15 lines):
diff -r 3c829399edfb -r a27c12733243 src/common/message_archiving.py
--- a/src/common/message_archiving.py Sun Oct 31 21:38:35 2010 +0100
+++ b/src/common/message_archiving.py Sun Oct 31 22:02:24 2010 +0100
@@ -97,7 +97,10 @@
return self.default
def logging_preference(self, jid, initiator_options=None):
- otr = self.get_item_pref(jid)['otr']
+ otr = self.get_item_pref(jid)
+ if not otr:
+ return
+ otr = otr['otr']
if initiator_options:
if ((initiator_options == ['mustnot'] and otr == 'forbid') or
(initiator_options == ['may'] and otr == 'require')):
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
