Commit 4fee27c2 authored by Philipp Hörist's avatar Philipp Hörist
Browse files

[pgp] Prepare for future Gajim changes

parent 3f4ae27a
......@@ -29,8 +29,7 @@ from gi.repository import GLib
from gajim import dialogs
from gajim.common import app
from gajim.common.connection_handlers_events import (
MessageNotSentEvent, MessageReceivedEvent, MamMessageReceivedEvent)
from gajim.common.connection_handlers_events import MessageNotSentEvent
from gajim.plugins import GajimPlugin
log = logging.getLogger('gajim.plugin_system.oldpgp')
......@@ -147,10 +146,15 @@ class OldPGPPlugin(GajimPlugin):
# Another Plugin already decrypted the message
account =
if isinstance(obj, MessageReceivedEvent):
if == 'message-received':
enc_tag = obj.stanza.getTag('x', namespace=nbxmpp.NS_ENCRYPTED)
elif isinstance(obj, MamMessageReceivedEvent):
enc_tag = obj.msg_.getTag('x', namespace=nbxmpp.NS_ENCRYPTED)
elif == 'mam-message-received':
# Compatibility for Gajim 1.0.3
if hasattr(obj, 'message'):
message = obj.message
message = obj.msg_
enc_tag = message.getTag('x', namespace=nbxmpp.NS_ENCRYPTED)
if enc_tag:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment