pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the nick change of private tabs. fixed #1845

Browse source
This commit is contained in:
louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 2010-09-20 23:35:07 +00:00
parent c536649112
commit d2158ba093
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gui.py
View file

@ -270,15 +270,17 @@ class Gui(object):
room.own_nick = new_nick room.own_nick = new_nick
# also change our nick in all private discussion of this room # also change our nick in all private discussion of this room
for _tab in self.tabs: for _tab in self.tabs:
if isinstance(_tab, PrivateTab) and is_jid_the_same(_tab.get_jid(), room.name): from common import debug
_tab.own_nick = new_nick debug('room name:%s\n' % _tab.get_name().split('/', 1))
if isinstance(_tab, PrivateTab) and _tab.get_name().split('/', 1)[0] == room.name:
_tab.get_room().own_nick = new_nick
user.change_nick(new_nick) user.change_nick(new_nick)
self.add_message_to_text_buffer(room, _('"[%(old)s]" is now known as "[%(new)s]"') % {'old':from_nick.replace('"', '\\"'), 'new':new_nick.replace('"', '\\"')}, colorized=True) self.add_message_to_text_buffer(room, _('"[%(old)s]" is now known as "[%(new)s]"') % {'old':from_nick.replace('"', '\\"'), 'new':new_nick.replace('"', '\\"')}, colorized=True)
# rename the private tabs if needed # rename the private tabs if needed
private_room = self.get_room_by_name('%s/%s' % (from_room, from_nick)) private_room = self.get_room_by_name('%s/%s' % (from_room, from_nick))
if private_room: if private_room:
self.add_message_to_text_buffer(private_room, _('"[%(old_nick)s]" is now known as "[%(new_nick)s]"') % {'old_nick':from_nick.replace('"', '\\"'), 'new_nick':new_nick.replace('"', '\\"')}, colorized=True) self.add_message_to_text_buffer(private_room, _('"[%(old_nick)s]" is now known as "[%(new_nick)s]"') % {'old_nick':from_nick.replace('"', '\\"'), 'new_nick':new_nick.replace('"', '\\"')}, colorized=True)
new_jid = private_room.name.split('/')[0]+'/'+new_nick new_jid = private_room.name.split('/', 1)[0]+'/'+new_nick
private_room.name = new_jid private_room.name = new_jid
def on_user_kicked(self, room, presence, user, from_nick): def on_user_kicked(self, room, presence, user, from_nick):
@ -336,15 +338,23 @@ class Gui(object):
When an user changes her status When an user changes her status
""" """
# build the message # build the message
display_message = False # flag to know if something significant enough
# to be displayed has changed
msg = _('"%s" changed: ')% from_nick.replace('"', '\\"') msg = _('"%s" changed: ')% from_nick.replace('"', '\\"')
if affiliation != user.affiliation: if affiliation != user.affiliation:
msg += _('affiliation: %s, ') % affiliation msg += _('affiliation: %s, ') % affiliation
display_message = True
if role != user.role: if role != user.role:
msg += _('role: %s, ') % role msg += _('role: %s, ') % role
display_message = True
if show != user.show and show in list(SHOW_NAME.keys()): if show != user.show and show in list(SHOW_NAME.keys()):
msg += _('show: %s, ') % SHOW_NAME[show] msg += _('show: %s, ') % SHOW_NAME[show]
if status != user.status: display_message = True
if status and status != user.status:
msg += _('status: %s, ') % status msg += _('status: %s, ') % status
display_message = True
if not display_message:
return
msg = msg[:-2] # remove the last ", " msg = msg[:-2] # remove the last ", "
hide_status_change = config.get('hide_status_change', -1) if config.get('hide_status_change', -1) >= -1 else -1 hide_status_change = config.get('hide_status_change', -1) if config.get('hide_status_change', -1) >= -1 else -1
if (hide_status_change == -1 or \ if (hide_status_change == -1 or \
@ -359,7 +369,7 @@ class Gui(object):
self.add_message_to_text_buffer(room, msg, colorized=True) self.add_message_to_text_buffer(room, msg, colorized=True)
private_room = self.get_room_by_name('%s/%s' % (from_room, from_nick)) private_room = self.get_room_by_name('%s/%s' % (from_room, from_nick))
if private_room: # display the message in private if private_room: # display the message in private
self.add_message_to_text_buffer(private_room, msg) self.add_message_to_text_buffer(private_room, msg, colorized=True)
# finally, effectively change the user status # finally, effectively change the user status
user.update(affiliation, show, status, role) user.update(affiliation, show, status, role)

2
src/keyboard.py
View file

@ -52,7 +52,7 @@ def read_char(s):
if first == 27: if first == 27:
(first, c) = get_next_byte(s) (first, c) = get_next_byte(s)
if not isinstance(first, int): if not isinstance(first, int):
return None return Nones
return "M-"+chr(first) return "M-"+chr(first)
if 194 <= first: if 194 <= first:
(code, c) = get_next_byte(s) # 2 bytes char (code, c) = get_next_byte(s) # 2 bytes char