Daniel Brötzmann pushed to branch master at gajim / gajim

Commits: 39f20787 by wurstsalat at 2022-08-15T10:57:20+02:00 cfix: MUC: muc_data for group chat nick is only available if joined

- - - - - cbc05e1b by wurstsalat at 2022-08-15T10:57:59+02:00 cfix: ConversationView: Don’t remove ReadmarkerRow

Fixes #11085

- - - - -

2 changed files:

- gajim/gtk/control.py - gajim/gtk/conversation/view.py

Changes:

===================================== gajim/gtk/control.py ===================================== @@ -499,7 +499,8 @@ def get_our_nick(self) -> str: if isinstance(self.contact, GroupchatParticipant): muc_data = self.client.get_module('MUC').get_muc_data( self.contact.jid.bare) - return muc_data.nick + if muc_data is not None: + return muc_data.nick

return app.nicks[self.contact.account]

===================================== gajim/gtk/conversation/view.py ===================================== @@ -130,10 +130,11 @@ def get_row_at_index(self, index: int) -> BaseRow:

def reset(self) -> None: for row in self.get_children()[2:]: + if isinstance(row, ReadMarkerRow): + continue row.destroy()

self._row_count = 0 - self._read_marker_row = None self._active_date_rows = set() self._message_id_row_map = {}

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b6e481ce71f9bf29510ce9cbbb85e101...