From c5cc462963363b2307a2a341da170829385a9589 Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 17 Jan 2013 17:37:06 +0100 Subject: Move to the upstream SleekXMPP - remove the decline command that is not in the trunk (and mediated declines are supported nowhere anyway) - change a bit xhtml-im support - change the bookmarks management a bit - Add a verification to avoid crashing when poezio will be launched the next time - Fix the (unrelated) bug when setting a jid affiliation --- 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 d3eb70ca..58d2771a 100644 --- a/src/multiuserchat.py +++ b/src/multiuserchat.py @@ -79,7 +79,7 @@ def join_groupchat(xmpp, jid, nick, passwd='', maxhistory=None, status=None, sho stanza.append(x) stanza.send() xmpp.plugin['xep_0045'].rooms[jid] = {} - xmpp.plugin['xep_0045'].our_nicks[jid] = nick + xmpp.plugin['xep_0045'].ourNicks[jid] = nick def leave_groupchat(xmpp, jid, own_nick, msg): """ @@ -119,6 +119,8 @@ def set_user_affiliation(xmpp, muc_jid, affiliation, nick=None, jid=None, reason jid = safeJID(jid) muc_jid = safeJID(muc_jid) try: - return xmpp.plugin['xep_0045'].set_affiliation(muc_jid, jid, nick, affiliation) + return xmpp.plugin['xep_0045'].setAffiliation(str(muc_jid), str(jid) if jid else None, nick, affiliation) except: + import traceback + log.debug('Error setting the affiliation: %s', traceback.format_exc()) return False -- cgit v1.2.3