From b4c9587a44fdce2b132b6e1b3951426fdb28e95b Mon Sep 17 00:00:00 2001 From: wurstsalat Date: Sat, 21 Nov 2020 14:37:47 +0100 Subject: [PATCH] Chat Markers: Correctly load displayed marker when restoring conversation --- gajim/common/storage/base.py | 4 +++- gajim/conversation_textview.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gajim/common/storage/base.py b/gajim/common/storage/base.py index da6e98d6e..eb82dfae2 100644 --- a/gajim/common/storage/base.py +++ b/gajim/common/storage/base.py @@ -49,8 +49,10 @@ def _adapt_common_error(common_error): sqlite3.register_converter('common_error', _convert_common_error) sqlite3.register_adapter(CommonError, _adapt_common_error) + def _convert_marker(marker): - return 'received' if marker == 0 else 'displayed' + return 'received' if int(marker) == 0 else 'displayed' + sqlite3.register_converter('marker', _convert_marker) diff --git a/gajim/conversation_textview.py b/gajim/conversation_textview.py index 7da560165..508b014d0 100644 --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -964,7 +964,10 @@ def print_conversation_line(self, text, kind, name, tim, message_line.set_error(to_user_string(error)) if marker is not None: - message_line.set_receipt() + if marker == 'received': + message_line.set_receipt() + elif marker == 'displayed': + message_line.set_displayed() if index is None: # New Message -- GitLab