summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-01-16 16:26:35 -0800
committerLance Stout <lancestout@gmail.com>2013-01-16 16:26:35 -0800
commit1dbfa29a1ebb9becb93911b33f026cc1a7a7faee (patch)
tree0fc8c30012eb151f2f6fe2637b71ec47bb074bbf /sleekxmpp/plugins
parenta0266dac6f30a1bfa89360a16ec70904b552f0a1 (diff)
parent6bac4741f6ca7d73c43ae0fcb138b07e71ed1352 (diff)
downloadslixmpp-1dbfa29a1ebb9becb93911b33f026cc1a7a7faee.tar.gz
slixmpp-1dbfa29a1ebb9becb93911b33f026cc1a7a7faee.tar.bz2
slixmpp-1dbfa29a1ebb9becb93911b33f026cc1a7a7faee.tar.xz
slixmpp-1dbfa29a1ebb9becb93911b33f026cc1a7a7faee.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0048/stanza.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0048/stanza.py b/sleekxmpp/plugins/xep_0048/stanza.py
index 2e30eb6a..21829392 100644
--- a/sleekxmpp/plugins/xep_0048/stanza.py
+++ b/sleekxmpp/plugins/xep_0048/stanza.py
@@ -50,7 +50,7 @@ class Conference(ElementBase):
def set_autojoin(self, value):
del self['autojoin']
if value in ('1', 'true', True):
- self._set_sub_text('autojoin', 'true')
+ self._set_attr('autojoin', 'true')
class URL(ElementBase):