Commit 89d1e307 authored by Philipp Hörist's avatar Philipp Hörist

PrivateChatControl: Make room_name a property

parent 8146f01d
......@@ -54,10 +54,7 @@ class PrivateChatControl(ChatControl):
room_jid, account)
if room_jid in app.interface.minimized_controls[account]:
self.room_ctrl = app.interface.minimized_controls[account][room_jid]
if self.room_ctrl:
self.room_name =
self.room_name = room_jid
self.gc_contact = gc_contact
ChatControl.__init__(self, parent_win, contact, account, session)
self.TYPE_ID = 'pm'
......@@ -86,6 +83,12 @@ class PrivateChatControl(ChatControl):
# TODO: remove all code that sets the contact here
def room_name(self):
if self.room_ctrl is not None:
return self.room_ctrl.room_name
return self.gc_contact.room_jid
def get_our_nick(self):
return self.room_ctrl.nick
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment