summaryrefslogtreecommitdiff
path: root/src/multiuserchat.py
diff options
context:
space:
mode:
authorlouiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>2010-01-30 02:50:24 +0000
committerlouiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>2010-01-30 02:50:24 +0000
commit95c7ad4ac82762e3e017cd8ef85d267add803126 (patch)
treee98d55b51030718874810c5e70f08b5dbfc2559d /src/multiuserchat.py
parent33cf82e0947be35bf4e4666d0db632b60e5c27f9 (diff)
downloadpoezio-95c7ad4ac82762e3e017cd8ef85d267add803126.tar.gz
poezio-95c7ad4ac82762e3e017cd8ef85d267add803126.tar.bz2
poezio-95c7ad4ac82762e3e017cd8ef85d267add803126.tar.xz
poezio-95c7ad4ac82762e3e017cd8ef85d267add803126.zip
on peut choisir son nick lors d'un /join machin@truc/NICK
Diffstat (limited to 'src/multiuserchat.py')
-rw-r--r--src/multiuserchat.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/multiuserchat.py b/src/multiuserchat.py
index 5f5a1ffd..6bded78e 100644
--- a/src/multiuserchat.py
+++ b/src/multiuserchat.py
@@ -64,15 +64,17 @@ class MultiUserChat(object):
mes.setType('groupchat')
self.connection.send(mes)
- def join_room(self, room, nick):
+ def join_room(self, room, nick, password=None):
"""Join a new room"""
- self.rooms.append(room)
- self.rn[room] = nick
+ # self.rooms.append(room)
+ # self.rn[room] = nick
pres = Presence(to='%s/%s' % (room, nick))
pres.setFrom('%s'%self.own_jid)
- pres.addChild(name='x', namespace=NS_MUC)
- open('fion', 'w').write(str(pres))
+ if password:
+ pres.addChild(name='x', namespace=NS_MUC)
+ else:
+ pres.addChild(name='x', namespace=NS_MUC)
self.connection.send(pres)
def quit_room(self, room, nick):