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

PrivateChatControl now hold room name so that we can draw banner of pm even if room control has been closed. Fixes #2527

Browse source
This commit is contained in:
Yann Leboulanger 2006-10-09 09:40:04 +00:00
parent feb9ba709a
commit c3062d493b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/chat_control.py
View file

@ -1019,11 +1019,8 @@ class ChatControl(ChatControlBase):
if self.resource:
name += '/' + self.resource
if self.TYPE_ID == message_control.TYPE_PM:
room_jid = self.contact.jid.split('/')[0]
room_ctrl = gajim.interface.msg_win_mgr.get_control(room_jid,
self.account)
name = _('%(nickname)s from room %(room_name)s') %\
{'nickname': name, 'room_name': room_ctrl.name}
{'nickname': name, 'room_name': self.room_name}
name = gtkgui_helpers.escape_for_pango_markup(name)
# We know our contacts nick, but if another contact has the same nick
@ -1676,7 +1673,7 @@ class ChatControl(ChatControlBase):
else:
kind = 'print_queue'
self.print_conversation(data[0], kind, tim = data[3],
encrypted = data[4], subject = data[1], xhtml = data[7])
encrypted = data[4], subject = data[1], xhtml = data[7])
if len(data) > 6 and isinstance(data[6], int):
message_ids.append(data[6])
if message_ids:

3
src/groupchat_control.py
View file

@ -95,6 +95,9 @@ class PrivateChatControl(ChatControl):
TYPE_ID = message_control.TYPE_PM
def __init__(self, parent_win, contact, acct):
room_jid = contact.jid.split('/')[0]
room_ctrl = gajim.interface.msg_win_mgr.get_control(room_jid, acct)
self.room_name = room_ctrl.name
ChatControl.__init__(self, parent_win, contact, acct)
self.TYPE_ID = 'pm'
self.display_names = (_('Private Chat'), _('Private Chats'))