diff options
| author | louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13> | 2010-03-24 18:01:22 +0000 |
|---|---|---|
| committer | louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13> | 2010-03-24 18:01:22 +0000 |
| commit | 19d86ea5ea5f135c5ad229add1a0d173ac44d2c9 (patch) | |
| tree | e8bab31fbb2b75cc31b26cc403183d1f136df152 /src/multiuserchat.py | |
| parent | 899a33ae477df3dec4541cb86d65783677d37211 (diff) | |
| download | poezio-19d86ea5ea5f135c5ad229add1a0d173ac44d2c9.tar.gz poezio-19d86ea5ea5f135c5ad229add1a0d173ac44d2c9.tar.bz2 poezio-19d86ea5ea5f135c5ad229add1a0d173ac44d2c9.tar.xz poezio-19d86ea5ea5f135c5ad229add1a0d173ac44d2c9.zip | |
fixed #1140 (Display the error messages correctly. And also we can provide a password when joining a room)
Diffstat (limited to 'src/multiuserchat.py')
| -rw-r--r-- | src/multiuserchat.py | 6 |
1 files changed, 4 insertions, 2 deletions
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): |