Changeset 8904

Timestamp:

10/13/07 19:47:13 (11 months ago)

Author:

asterix

Message:

[misc] fix change nick behaviour. fixes #3495

Files:

• trunk/src/groupchat_control.py (modified) (4 diffs)

trunk/src/groupchat_control.py

@@ -196 +196 @@
                 self.room_jid = self.contact.jid
                 self.nick = contact.name
+                self.new_nick = ''
                 self.name = self.room_jid.split('@')[0]
 
@@ -974 +975 @@
                                         self.print_conversation(s, 'info', tim = tim)
                                 elif '303' in statusCode: # Someone changed his or her nick
-                                        if new_nick == self.nick: # We changed our nick
+                                        if new_nick == self.new_nick: # We changed our nick
+                                                self.nick = self.new_nick
+                                                self.new_nick = ''
                                                 s = _('You are now known as %s') % new_nick
                                         else:
@@ -1243 +1246 @@
                                         return True
                                 gajim.connections[self.account].join_gc(nick, self.room_jid, None)
-                                self.nick = nick
+                                self.new_nick = nick
                                 self.clear(self.msg_textview)
                         else:
@@ -1522 +1525 @@
                                 return
                         gajim.connections[self.account].join_gc(nick, self.room_jid, None)
-                        self.nick = nick
+                        self.new_nick = nick
+                def on_cancel():
+                        self.new_nick = ''
                 instance = dialogs.InputDialog(title, prompt, proposed_nick,
-                        is_modal = False, ok_handler = on_ok)
+                        is_modal = False, ok_handler = on_ok, cancel_handler = on_cancel)
 
         def minimize(self, status='offline'):