summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0030
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-03-18 15:51:44 -0400
committerLance Stout <lancestout@gmail.com>2011-03-18 15:51:44 -0400
commitf2c99798a6cf0dafe10fd547b036ecbb7a32569b (patch)
tree8a5d8192e3e0ed06cdb124a15daad5039a62e479 /sleekxmpp/plugins/xep_0030
parentd5b3a5282763e4f74816ff392bd8cd47dd9f7a95 (diff)
parent996ca52471931ccb3ac5a0f661e52fdc400db64b (diff)
downloadslixmpp-f2c99798a6cf0dafe10fd547b036ecbb7a32569b.tar.gz
slixmpp-f2c99798a6cf0dafe10fd547b036ecbb7a32569b.tar.bz2
slixmpp-f2c99798a6cf0dafe10fd547b036ecbb7a32569b.tar.xz
slixmpp-f2c99798a6cf0dafe10fd547b036ecbb7a32569b.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/plugins/xep_0030')
-rw-r--r--sleekxmpp/plugins/xep_0030/disco.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0030/disco.py b/sleekxmpp/plugins/xep_0030/disco.py
index 45d6931b..1c967bd5 100644
--- a/sleekxmpp/plugins/xep_0030/disco.py
+++ b/sleekxmpp/plugins/xep_0030/disco.py
@@ -119,7 +119,7 @@ class xep_0030(base_plugin):
def post_init(self):
"""Handle cross-plugin dependencies."""
base_plugin.post_init(self)
- if self.xmpp['xep_0059']:
+ if 'xep_0059' in self.xmpp.plugin:
register_stanza_plugin(DiscoItems,
self.xmpp['xep_0059'].stanza.Set)