summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-10-29 07:27:01 +0200
committerFlorent Le Coz <louiz@louiz.org>2011-10-29 07:27:01 +0200
commitab60a8ddde7bd9478bfe60daf48145e5b55690f0 (patch)
treef26f5712d91b064d2ab78d2a142f2fba7cc50565
parent0451127ff8a1b96772b58ff9e246621d0df4c99e (diff)
parent6d436f570ae186a472fe0d743cef7339e0c16d5d (diff)
downloadpoezio-ab60a8ddde7bd9478bfe60daf48145e5b55690f0.tar.gz
poezio-ab60a8ddde7bd9478bfe60daf48145e5b55690f0.tar.bz2
poezio-ab60a8ddde7bd9478bfe60daf48145e5b55690f0.tar.xz
poezio-ab60a8ddde7bd9478bfe60daf48145e5b55690f0.zip
Merge branch 'master' of http://git.louiz.org/poezio into plugins
-rw-r--r--data/default_config.cfg4
-rw-r--r--src/tabs.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/data/default_config.cfg b/data/default_config.cfg
index 858c90bf..8ff4805d 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -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 =
diff --git a/src/tabs.py b/src/tabs.py
index a160a0a1..b0de89c0 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -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):
"""