[pgp] Prepare for future Gajim changes

1 files changed, 9 insertions, 5 deletions

diff --git a/pgp/pgpplugin.py b/pgp/pgpplugin.py
index 652a3fe..1c6478e 100644
--- a/pgp/pgpplugin.py
+++ b/pgp/pgpplugin.py
@@ -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
             return
         account = conn.name
-        if isinstance(obj, MessageReceivedEvent):
+        if obj.name == '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 obj.name == 'mam-message-received':
+            # Compatibility for Gajim 1.0.3
+            if hasattr(obj, 'message'):
+                message = obj.message
+            else:
+                message = obj.msg_
+            enc_tag = message.getTag('x', namespace=nbxmpp.NS_ENCRYPTED)
         else:
             return
         if enc_tag: