From 19d86ea5ea5f135c5ad229add1a0d173ac44d2c9 Mon Sep 17 00:00:00 2001 From: "louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13" Date: Wed, 24 Mar 2010 18:01:22 +0000 Subject: fixed #1140 (Display the error messages correctly. And also we can provide a password when joining a room) --- src/multiuserchat.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/multiuserchat.py') diff --git a/src/multiuserchat.py b/src/multiuserchat.py index c8a1aafc..a54874a7 100644 --- a/src/multiuserchat.py +++ b/src/multiuserchat.py @@ -152,10 +152,12 @@ class MultiUserChat(object): """Join a new room""" pres = Presence(to='%s/%s' % (room, nick)) pres.setFrom('%s'%self.own_jid) - if password: + if not password: pres.addChild(name='x', namespace=NS_MUC) else: - pres.addChild(name='x', namespace=NS_MUC) + item = pres.addChild(name='x', namespace=NS_MUC) + passwd = item.addChild(name='password') + passwd.setData(password) self.connection.send(pres) def quit_room(self, room, nick, msg=None): -- cgit v1.2.3