Changeset 8955 for branches/gajim_0.11.2/src/groupchat_control.py

Timestamp:

11/09/07 20:30:15 (13 months ago)

Author:

asterix

Message:

merge some fixes from trunk: [8864] [8866] [8881] [8884] [8887] [8894] [8895] [8902] [8903] [8904] [8905] [8906] [8910] [8918] [8919] [8921] [8923] [8924] [8938] [8942] [8952] [8953] [8954]

Files:

• branches/gajim_0.11.2/src/groupchat_control.py (modified) (5 diffs)

branches/gajim_0.11.2/src/groupchat_control.py

@@ -187 +187 @@
 
                 self.room_jid = self.contact.jid
-                self.nick = contact.name
+                self.nick = contact.name.decode('utf-8')
+                self.new_nick = ''
                 self.name = self.room_jid.split('@')[0]
 
@@ -868 +869 @@
                                 self.print_conversation(s, 'info')
                         elif '303' in statusCode: # Someone changed his or her nick
-                                if nick == self.nick: # We changed our nick
-                                        self.nick = new_nick
+                                if 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:
@@ -896 +898 @@
                                                 os.path.join(path, puny_new_nick + ext)
                                 for old_file in files:
-                                        if os.path.exists(old_file):
+                                        if os.path.exists(old_file) and old_file != files[old_file]:
                                                 if os.path.exists(files[old_file]):
                                                         # Windows require this
@@ -1107 +1109 @@
                                         return True
                                 gajim.connections[self.account].join_gc(nick, self.room_jid, None)
+                                self.new_nick = nick
                                 self.clear(self.msg_textview)
                         else:
@@ -1389 +1392 @@
                         gajim.connections[self.account].join_gc(nick, self.room_jid, None)
                         self.nick = nick
+
                 instance = dialogs.InputDialog(title, prompt, proposed_nick,
                         is_modal = False, ok_handler = on_ok)