diff options
| author | louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13> | 2010-10-18 22:57:54 +0000 |
|---|---|---|
| committer | louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13> | 2010-10-18 22:57:54 +0000 |
| commit | 3b3042d315f68c2a0a140dd2b8e3212158b5c35b (patch) | |
| tree | f2f0e7c8dffed94044b7841cab3618d526e960fb | |
| parent | f4c5e0a091e9e56e95ff687654e68e90dc6144e0 (diff) | |
| download | poezio-3b3042d315f68c2a0a140dd2b8e3212158b5c35b.tar.gz poezio-3b3042d315f68c2a0a140dd2b8e3212158b5c35b.tar.bz2 poezio-3b3042d315f68c2a0a140dd2b8e3212158b5c35b.tar.xz poezio-3b3042d315f68c2a0a140dd2b8e3212158b5c35b.zip | |
fix password for muc. fixed #1940
| -rw-r--r-- | src/gui.py | 4 | ||||
| -rw-r--r-- | src/multiuserchat.py | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -970,10 +970,10 @@ class Gui(object): return room = room.lower() if r and not r.joined: - self.xmpp.plugin['xep_0045'].joinMUC(room, nick, password) + muc.join_groupchat(self.xmpp, room, nick, password) if not r: # if the room window exists, we don't recreate it. self.open_new_room(room, nick) - self.xmpp.plugin['xep_0045'].joinMUC(room, nick, password) + muc.join_groupchat(self.xmpp, room, nick, password) else: r.own_nick = nick r.users = [] diff --git a/src/multiuserchat.py b/src/multiuserchat.py index c9fdc5b9..5800e7f9 100644 --- a/src/multiuserchat.py +++ b/src/multiuserchat.py @@ -74,11 +74,11 @@ def change_nick(xmpp, jid, nick): xmpp.makePresence(pto='%s/%s' % (jid, nick), pfrom=xmpp.boundjid.bare).send() -def join_groupchat(xmpp, jid, nick, password=''): +def join_groupchat(xmpp, jid, nick, passwd=''): """ Join the groupchat """ - xmpp.plugin['xep_0045'].joinMUC(jid, nick, password) + xmpp.plugin['xep_0045'].joinMUC(jid, nick, maxhistory=None, password=passwd) def leave_groupchat(xmpp, jid, own_nick, msg): """ |