Also, do not crash when receiving a message from someone who is not a
contact
This commit is contained in:
parent
5c12216392
commit
eaced10c16
1 changed files with 13 additions and 6 deletions
|
@ -2000,10 +2000,13 @@ class ConversationTab(ChatTab):
|
||||||
def on_lose_focus(self):
|
def on_lose_focus(self):
|
||||||
contact = roster.get_contact_by_jid(self.get_name())
|
contact = roster.get_contact_by_jid(self.get_name())
|
||||||
jid = JID(self.get_name())
|
jid = JID(self.get_name())
|
||||||
|
if contact:
|
||||||
if jid.resource:
|
if jid.resource:
|
||||||
resource = contact.get_resource_by_fulljid(jid.full)
|
resource = contact.get_resource_by_fulljid(jid.full)
|
||||||
else:
|
else:
|
||||||
resource = contact.get_highest_priority_resource()
|
resource = contact.get_highest_priority_resource()
|
||||||
|
else:
|
||||||
|
resource = None
|
||||||
self.state = 'normal'
|
self.state = 'normal'
|
||||||
self.text_win.remove_line_separator()
|
self.text_win.remove_line_separator()
|
||||||
self.text_win.add_line_separator()
|
self.text_win.add_line_separator()
|
||||||
|
@ -2014,10 +2017,14 @@ class ConversationTab(ChatTab):
|
||||||
def on_gain_focus(self):
|
def on_gain_focus(self):
|
||||||
contact = roster.get_contact_by_jid(self.get_name())
|
contact = roster.get_contact_by_jid(self.get_name())
|
||||||
jid = JID(self.get_name())
|
jid = JID(self.get_name())
|
||||||
|
if contact:
|
||||||
if jid.resource:
|
if jid.resource:
|
||||||
resource = contact.get_resource_by_fulljid(jid.full)
|
resource = contact.get_resource_by_fulljid(jid.full)
|
||||||
else:
|
else:
|
||||||
resource = contact.get_highest_priority_resource()
|
resource = contact.get_highest_priority_resource()
|
||||||
|
else:
|
||||||
|
resource = None
|
||||||
|
|
||||||
self.state = 'current'
|
self.state = 'current'
|
||||||
curses.curs_set(1)
|
curses.curs_set(1)
|
||||||
if config.get('send_chat_states', 'true') == 'true' and not self.input.get_text() or not self.input.get_text().startswith('//'):
|
if config.get('send_chat_states', 'true') == 'true' and not self.input.get_text() or not self.input.get_text().startswith('//'):
|
||||||
|
|
Loading…
Reference in a new issue