[Git][gajim/gajim][mainwindow] Fix readmarker breaking merge

[Philipp Hörist]

Philipp Hörist pushed to branch mainwindow at gajim / gajim


Commits:
a45033ce by lovetox at 2021-04-04T23:51:48+02:00
Fix readmarker breaking merge

- - - - -


1 changed file:

- gajim/gtk/conversation/view.py


Changes:

=====================================
gajim/gtk/conversation/view.py
=====================================
@@ -236,6 +236,9 @@ def _find_ancestor(self, message):
             if row is None:
                 return None
 
+            if row.type == 'read_marker':
+                continue
+
             if row.type != 'chat':
                 return None
 
@@ -254,6 +257,9 @@ def _update_descendants(self, message):
             if row is None:
                 return
 
+            if row.type == 'read_marker':
+                continue
+
             if row.type != 'chat':
                 return
 



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/a45033ce8f89390dd7765c279918467d3b848360

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/a45033ce8f89390dd7765c279918467d3b848360
You're receiving this email because of your account on dev.gajim.org.



_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits