From 06d5ecb8795d5469de54749715f644b9657b3a27 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Tue, 18 Jun 2013 20:32:17 +0200 Subject: Message to join the room with an other nick only if the room is not joined yet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because that message doesn’t make any sense if you are in the room and you get a nick conflict from the /nick command. --- src/core.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/core.py') 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): -- cgit v1.2.3