Philipp Hörist pushed to branch unify-control at gajim / gajim

Commits: d35e20ed by lovetox at 2022-08-08T14:34:06+02:00 fix: ChatControl: Fix type discovery

- - - - - 65d64165 by lovetox at 2022-08-08T14:56:31+02:00 fix: Disable user status show callback

- - - - -

1 changed file:

- gajim/gtk/control.py

Changes:

===================================== gajim/gtk/control.py ===================================== @@ -256,25 +256,17 @@ def _on_message_moderated(self, event: events.MessageModerated) -> None: self.conversation_view.show_message_retraction( event.moderation.stanza_id, text)

- @property - def type(self) -> ControlType: - assert self._type is not None - return self._type - @property def is_chat(self) -> bool: - assert self._type is not None - return self._type.is_chat + return isinstance(self.contact, BareContact)

@property def is_privatechat(self) -> bool: - assert self._type is not None - return self._type.is_privatechat + return isinstance(self.contact, GroupchatParticipant)

@property def is_groupchat(self) -> bool: - assert self._type is not None - return self._type.is_groupchat + return isinstance(self.contact, GroupchatContact)

def _on_ping_event(self, event: events.PingEventT) -> None: raise NotImplementedError @@ -769,7 +761,7 @@ def _on_user_status_show_changed(self, ) -> None:

# TODO: This cant work - + return if isinstance(self.contact, GroupchatContact): if not contact.settings.get('print_status'): return

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