Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
8ea391f5 by wurstsalat at 2022-03-15T19:03:47+01:00
Don't merge messages with different display markings
- - - - -
1 changed file:
- gajim/gtk/conversation/rows/message.py
Changes:
=====================================
gajim/gtk/conversation/rows/message.py
=====================================
@@ -100,6 +100,7 @@ def __init__(self,
self.name = name
self.text = text
self.additional_data = additional_data
+ self.display_marking = display_marking
self._account = account
self._contact = contact
@@ -300,6 +301,15 @@ def is_same_encryption(self, message: MessageRow) -> bool:
return True
return False
+ def is_same_display_marking(self, message: MessageRow) -> bool:
+ if message.display_marking == self.display_marking:
+ return True
+ if (message.display_marking is not None and
+ self.display_marking is not None):
+ if message.display_marking.name == self.display_marking.name:
+ return True
+ return False
+
def is_mergeable(self, message: MessageRow) -> bool:
if message.type != self.type:
return False
@@ -307,6 +317,8 @@ def is_mergeable(self, message: MessageRow) -> bool:
return False
if not self.is_same_encryption(message):
return False
+ if not self.is_same_display_marking(message):
+ return False
return abs(message.timestamp - self.timestamp) < MERGE_TIMEFRAME
def on_copy_message(self, _widget: Gtk.Widget) -> None:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/8ea391f5e52f7e1c86173963d8a1ad646ae21b29
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/8ea391f5e52f7e1c86173963d8a1ad646ae21b29
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
