Merge branch 'master' of http://git.louiz.org/poezio into plugins

This commit is contained in:
Florent Le Coz 2011-10-29 07:27:01 +02:00
commit ab60a8ddde
2 changed files with 4 additions and 3 deletions

View file

@ -20,10 +20,10 @@ resource =
# If this is empty, the $USER environnement variable will be used
default_nick =
# Jabber identifiant. Specify it only if you want to connect using an existing
# Jabber identifier. Specify it only if you want to connect using an existing
# account on a server. This is optional and useful only for some features,
# like room administration, nickname registration.
# The 'server' option will be ignored if you specify a JID (Jabber identifiant)
# The 'server' option will be ignored if you specify a JID (Jabber identifier)
# It should be in the form nickname@server.tld
jid =

View file

@ -632,7 +632,8 @@ class MucTab(ChatTab):
args = common.shell_split(arg)
if not len(args):
self.core.command_help('kick')
self._command_change_role('kick '+arg)
else:
self.command_role('none '+arg)
def command_role(self, arg):
"""