Changeset 9089

Timestamp:

12/03/07 20:39:40 (12 months ago)

Author:

jim++

Message:

Readd part of [8904] removed in [8938]. Then mix them. So we fix #3495/#3506 and problem when connecting
with an already used nick.
Fixes problem when we change nick with dialog to an already used one and then cancel. Fixes #3506.

Files:

• trunk/src/groupchat_control.py (modified) (1 diff)

trunk/src/groupchat_control.py

@@ -1538 +1538 @@
                                 return
                         gajim.connections[self.account].join_gc(nick, self.room_jid, None)
-                        self.nick = nick
+                        if gajim.gc_connected[self.account][self.room_jid]:
+                                # We are changing nick, we will change self.nick when we receive 
+                                # presence that inform that it works
+                                self.new_nick = nick
+                        else:
+                                # We are connecting, we will not get a changed nick presence so
+                                # change it NOW. We don't already have a nick so it's harmless
+                                self.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'):