From 97f6b84b908d85cf4d9de074d8ea35989714d9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Tue, 1 Aug 2017 23:19:03 +0200 Subject: [PATCH] Remove old unused code --- gajim/common/contacts.py | 3 +-- gajim/session.py | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gajim/common/contacts.py b/gajim/common/contacts.py index 76ae5a0a2..c8e2132f0 100644 --- a/gajim/common/contacts.py +++ b/gajim/common/contacts.py @@ -94,7 +94,7 @@ class Contact(CommonContact): """ def __init__(self, jid, account, name='', groups=None, show='', status='', sub='', ask='', resource='', priority=0, keyID='', client_caps=None, - our_chatstate=None, chatstate=None, idle_time=None, msg_log_id=None): + our_chatstate=None, chatstate=None, idle_time=None): if not isinstance(jid, str): print('no str') if groups is None: @@ -111,7 +111,6 @@ class Contact(CommonContact): self.priority = priority self.keyID = keyID - self.msg_log_id = msg_log_id self.idle_time = idle_time self.pep = {} diff --git a/gajim/session.py b/gajim/session.py index fcc1aee80..714514fda 100644 --- a/gajim/session.py +++ b/gajim/session.py @@ -129,8 +129,6 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): # Brand new message, incoming. contact.our_chatstate = obj.chatstate contact.chatstate = obj.chatstate - if obj.msg_log_id: # Do not overwrite an existing msg_log_id with None - contact.msg_log_id = obj.msg_log_id # THIS MUST BE AFTER chatstates handling # AND BEFORE playsound (else we hear sounding on chatstates!)