From bf6e25576ea929ff13e259d2479ba5d2544bbf91 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 5 Nov 2007 21:49:42 +0000
Subject: [PATCH] fix nick behaviour when we enter a room with an already used
 nick.

---
 src/groupchat_control.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 2e56f93b2..65ad1fc00 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -1533,11 +1533,9 @@ class GroupchatControl(ChatControlBase):
 				_('The nickname has not allowed characters.'))
 				return
 			gajim.connections[self.account].join_gc(nick, self.room_jid, None)
-			self.new_nick = nick
-		def on_cancel():
-			self.new_nick = ''
+			self.nick = nick
 		instance = dialogs.InputDialog(title, prompt, proposed_nick,
-			is_modal = False, ok_handler = on_ok, cancel_handler = on_cancel)
+			is_modal = False, ok_handler = on_ok)
 
 	def minimize(self, status='offline'):
 		# Minimize it