summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui.py2
-rw-r--r--src/multiuserchat.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui.py b/src/gui.py
index 13fea525..aaad7544 100644
--- a/src/gui.py
+++ b/src/gui.py
@@ -474,7 +474,7 @@ class Gui(object):
A subscription changed, or we received a roster item
after a roster request, etc
"""
- debug('Roster Update: \n%s\n\n' % iq)
+ # debug('Roster Update: \n%s\n\n' % iq)
for item in iq.findall('{jabber:iq:roster}query/{jabber:iq:roster}item'):
jid = item.attrib['jid']
contact = self.roster.get_contact_by_jid(jid)
diff --git a/src/multiuserchat.py b/src/multiuserchat.py
index d1941a03..c9fdc5b9 100644
--- a/src/multiuserchat.py
+++ b/src/multiuserchat.py
@@ -74,7 +74,7 @@ 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=None):
+def join_groupchat(xmpp, jid, nick, password=''):
"""
Join the groupchat
"""