summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-09-12 10:32:19 -0700
committerLance Stout <lancestout@gmail.com>2013-09-12 10:32:19 -0700
commit19b24b276d2d4591f5ee852d98966518d46ce7d3 (patch)
treecfc57cd0383deb10a776d6f5bb0d91696c922b27 /sleekxmpp
parent23750357e21ce1e22445b2e702bdd4efb77f2369 (diff)
downloadslixmpp-19b24b276d2d4591f5ee852d98966518d46ce7d3.tar.gz
slixmpp-19b24b276d2d4591f5ee852d98966518d46ce7d3.tar.bz2
slixmpp-19b24b276d2d4591f5ee852d98966518d46ce7d3.tar.xz
slixmpp-19b24b276d2d4591f5ee852d98966518d46ce7d3.zip
Update MAM to use latest carbons.
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/plugins/xep_0313/mam.py1
-rw-r--r--sleekxmpp/plugins/xep_0313/stanza.py8
2 files changed, 2 insertions, 7 deletions
diff --git a/sleekxmpp/plugins/xep_0313/mam.py b/sleekxmpp/plugins/xep_0313/mam.py
index 15aee828..dbff46a2 100644
--- a/sleekxmpp/plugins/xep_0313/mam.py
+++ b/sleekxmpp/plugins/xep_0313/mam.py
@@ -36,6 +36,7 @@ class XEP_0313(BasePlugin):
register_stanza_plugin(Iq, stanza.MAM)
register_stanza_plugin(Iq, stanza.Preferences)
register_stanza_plugin(Message, stanza.Result)
+ register_stanza_plugin(stanza.Result, self.xmpp['xep_0297'].stanza.Forwarded)
register_stanza_plugin(stanza.MAM, self.xmpp['xep_0059'].stanza.Set)
def retrieve(self, jid=None, start=None, end=None, with_jid=None, ifrom=None,
diff --git a/sleekxmpp/plugins/xep_0313/stanza.py b/sleekxmpp/plugins/xep_0313/stanza.py
index a33c2e35..476cbbfb 100644
--- a/sleekxmpp/plugins/xep_0313/stanza.py
+++ b/sleekxmpp/plugins/xep_0313/stanza.py
@@ -122,10 +122,4 @@ class Result(ElementBase):
name = 'result'
namespace = 'urn:xmpp:mam:tmp'
plugin_attrib = 'mam_result'
- interfaces = set(['forwarded', 'queryid', 'id'])
-
- def get_forwarded(self):
- return self.parent()['forwarded']
-
- def del_forwarded(self):
- del self.parent()['forwarded']
+ interfaces = set(['queryid', 'id'])