| ... |
... |
@@ -2066,13 +2066,13 @@ class RosterWindow: |
|
2066
|
2066
|
app.connections[account].change_status(status, txt)
|
|
2067
|
2067
|
self._status_selector.update()
|
|
2068
|
2068
|
|
|
2069
|
|
- def chg_contact_status(self, contact, show, status, account):
|
|
|
2069
|
+ def chg_contact_status(self, contact, show, status_message, account):
|
|
2070
|
2070
|
"""
|
|
2071
|
2071
|
When a contact changes their status
|
|
2072
|
2072
|
"""
|
|
2073
|
2073
|
contact_instances = app.contacts.get_contacts(account, contact.jid)
|
|
2074
|
2074
|
contact.show = show
|
|
2075
|
|
- contact.status = status
|
|
|
2075
|
+ contact.status = status_message
|
|
2076
|
2076
|
# name is to show in conversation window
|
|
2077
|
2077
|
name = contact.get_shown_name()
|
|
2078
|
2078
|
fjid = contact.get_full_jid()
|
| ... |
... |
@@ -2105,12 +2105,12 @@ class RosterWindow: |
|
2105
|
2105
|
if ctrl and not ctrl.is_groupchat:
|
|
2106
|
2106
|
ctrl.contact = app.contacts.get_contact_with_highest_priority(
|
|
2107
|
2107
|
account, contact.jid)
|
|
2108
|
|
- ctrl.update_status_display(name, uf_show, status)
|
|
|
2108
|
+ ctrl.update_status_display(name, uf_show, status_message)
|
|
2109
|
2109
|
|
|
2110
|
2110
|
if contact.resource:
|
|
2111
|
2111
|
ctrl = app.interface.msg_win_mgr.get_control(fjid, account)
|
|
2112
|
2112
|
if ctrl:
|
|
2113
|
|
- ctrl.update_status_display(name, uf_show, status)
|
|
|
2113
|
+ ctrl.update_status_display(name, uf_show, status_message)
|
|
2114
|
2114
|
|
|
2115
|
2115
|
# Delete pep if needed
|
|
2116
|
2116
|
keep_pep = any(c.show not in ('error', 'offline') for c in
|
| ... |
... |
@@ -2134,8 +2134,8 @@ class RosterWindow: |
|
2134
|
2134
|
self_contact = app.contacts.get_contact(account,
|
|
2135
|
2135
|
app.get_jid_from_account(account), resource=self_resource)
|
|
2136
|
2136
|
if self_contact:
|
|
2137
|
|
- status = app.connections[account].status
|
|
2138
|
|
- self.chg_contact_status(self_contact, show, status, account)
|
|
|
2137
|
+ status_message = app.connections[account].status_message
|
|
|
2138
|
+ self.chg_contact_status(self_contact, show, status_message, account)
|
|
2139
|
2139
|
self.set_account_status_icon(account)
|
|
2140
|
2140
|
if show == 'offline':
|
|
2141
|
2141
|
if self.quit_on_next_offline > -1:
|