copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[misc] fix change nick behaviour. fixes #3495

This commit is contained in:
Yann Leboulanger 2007-10-13 17:47:13 +00:00
parent 0869ce362c
commit d0649b8f81
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/groupchat_control.py
View File

@ -195,6 +195,7 @@ class GroupchatControl(ChatControlBase):
self.room_jid = self.contact.jid self.room_jid = self.contact.jid
self.nick = contact.name self.nick = contact.name
self.new_nick = ''
self.name = self.room_jid.split('@')[0] self.name = self.room_jid.split('@')[0]
compact_view = gajim.config.get('compact_view') compact_view = gajim.config.get('compact_view')
@ -973,7 +974,9 @@ class GroupchatControl(ChatControlBase):
'reason': reason } 'reason': reason }
self.print_conversation(s, 'info', tim = tim) self.print_conversation(s, 'info', tim = tim)
elif '303' in statusCode: # Someone changed his or her nick 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 s = _('You are now known as %s') % new_nick
else: else:
s = _('%s is now known as %s') % (nick, new_nick) s = _('%s is now known as %s') % (nick, new_nick)
@ -1242,7 +1245,7 @@ class GroupchatControl(ChatControlBase):
_('The nickname has not allowed characters.')) _('The nickname has not allowed characters.'))
return True return True
gajim.connections[self.account].join_gc(nick, self.room_jid, None) gajim.connections[self.account].join_gc(nick, self.room_jid, None)
self.nick = nick self.new_nick = nick
self.clear(self.msg_textview) self.clear(self.msg_textview)
else: else:
self.get_command_help(command) self.get_command_help(command)
@ -1521,9 +1524,11 @@ class GroupchatControl(ChatControlBase):
_('The nickname has not allowed characters.')) _('The nickname has not allowed characters.'))
return return
gajim.connections[self.account].join_gc(nick, self.room_jid, None) 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, 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'): def minimize(self, status='offline'):
# Minimize it # Minimize it