Commit 05f9bd0b authored by Philipp Hörist's avatar Philipp Hörist

Remove user_nick attribute from decrypted-message event

It's available via properties attribute
parent fc8930aa
......@@ -193,7 +193,6 @@ class Message(BaseModule):
'delayed': properties.user_timestamp is not None,
'gc_control': gc_control,
'xhtml': xhtml,
'user_nick': properties.nickname,
'popup': False,
'msg_log_id': None,
'displaymarking': parse_securitylabel(stanza),
......
......@@ -107,7 +107,6 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase):
'session': session,
'gc_control': None,
'xhtml': parse_xhtml(properties),
'user_nick': properties.nickname,
'popup': False,
'msg_log_id': None,
'displaymarking': None,
......
......@@ -379,7 +379,7 @@ class GajimRemote(Server):
self.raise_signal('NewMessage', (
obj.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp,
event_type, obj.properties.subject,
obj.msg_log_id, obj.user_nick, obj.xhtml]))
obj.msg_log_id, obj.properties.nickname, obj.xhtml]))
def on_our_status(self, obj):
self.raise_signal('AccountPresence', (obj.show, obj.conn.name))
......
......@@ -185,7 +185,7 @@ class ChatControlSession:
if not contact:
# contact is not in roster
contact = app.interface.roster.add_to_not_in_the_roster(
obj.conn.name, jid, obj.user_nick)
obj.conn.name, jid, obj.properties.nickname)
if not self.control:
ctrl = app.interface.msg_win_mgr.search_control(obj.jid,
......
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