diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-09-28 11:02:57 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-09-28 11:02:57 -0700 |
| commit | a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3 (patch) | |
| tree | 40d99fd4b547e4f81e2c9c2b29682c6bb7ac7a06 /sleekxmpp/plugins/xep_0297/forwarded.py | |
| parent | 73ce9a5eccb5fea6f9a6dd72410cdada2a43347f (diff) | |
| parent | ee9c4abd08db06fd6dc808d48c43cd6d57bd1aa1 (diff) | |
| download | slixmpp-a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3.tar.gz slixmpp-a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3.tar.bz2 slixmpp-a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3.tar.xz slixmpp-a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0297/forwarded.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0297/forwarded.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/xep_0297/forwarded.py b/sleekxmpp/plugins/xep_0297/forwarded.py index 7876967c..95703a2d 100644 --- a/sleekxmpp/plugins/xep_0297/forwarded.py +++ b/sleekxmpp/plugins/xep_0297/forwarded.py @@ -26,9 +26,14 @@ class XEP_0297(BasePlugin): def plugin_init(self): register_stanza_plugin(Message, Forwarded) - register_stanza_plugin(Forwarded, Message) - register_stanza_plugin(Forwarded, Presence) - register_stanza_plugin(Forwarded, Iq) + + # While these are marked as iterable, that is just for + # making it easier to extract the forwarded stanza. There + # still can be only a single forwarded stanza. + register_stanza_plugin(Forwarded, Message, iterable=True) + register_stanza_plugin(Forwarded, Presence, iterable=True) + register_stanza_plugin(Forwarded, Iq, iterable=True) + register_stanza_plugin(Forwarded, self.xmpp['xep_0203'].stanza.Delay) self.xmpp.register_handler( |