summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2013-06-18 20:32:17 +0200
committerFlorent Le Coz <louiz@louiz.org>2013-06-18 20:32:17 +0200
commit06d5ecb8795d5469de54749715f644b9657b3a27 (patch)
treeae40aa764a2957ef4608241c4bfa0cbdd8f564ac /src
parent3015b3b9e58b33210b79633110608b5fb41dead0 (diff)
downloadpoezio-06d5ecb8795d5469de54749715f644b9657b3a27.tar.gz
poezio-06d5ecb8795d5469de54749715f644b9657b3a27.tar.bz2
poezio-06d5ecb8795d5469de54749715f644b9657b3a27.tar.xz
poezio-06d5ecb8795d5469de54749715f644b9657b3a27.zip
Message to join the room with an other nick only if the room is not joined yet
Because that message doesn’t make any sense if you are in the room and you get a nick conflict from the /nick command.
Diffstat (limited to 'src')
-rw-r--r--src/core.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core.py b/src/core.py
index b4522ec4..8021a3ed 100644
--- a/src/core.py
+++ b/src/core.py
@@ -3511,7 +3511,8 @@ class Core(object):
if config.get('alternative_nickname', '') != '':
self.command_join('%s/%s'% (tab.name, tab.own_nick+config.get('alternative_nickname', '')))
else:
- tab.add_message(_('You can join the room with an other nick, by typing "/join /other_nick"'), typ=2)
+ if not tab.joined:
+ tab.add_message(_('You can join the room with an other nick, by typing "/join /other_nick"'), typ=2)
self.refresh_window()
def outgoing_stanza(self, stanza):