fix: Preferences: Enable roster settings again

2 files changed, 11 insertions, 16 deletions

diff --git a/gajim/gtk/control.py b/gajim/gtk/control.py
index eeb9ace4a..fc19c65ce 100644
--- a/gajim/gtk/control.py
+++ b/gajim/gtk/control.py
@@ -97,9 +97,9 @@ class ChatControl(EventHelper):
         self._scrolled_view.connect('request-history',
                                     self.fetch_n_lines_history, 20)
 
-        self.roster = GroupchatRoster()
+        self._roster = GroupchatRoster()
 
-        self._ui.conv_view_box.add(self.roster)
+        self._ui.conv_view_box.add(self._roster)
 
         # Keeps track of whether the ConversationView is populated
         self._chat_loaded: bool = False
@@ -132,6 +132,9 @@ class ChatControl(EventHelper):
     def has_active_chat(self) -> bool:
         return self._contact is not None
 
+    def get_group_chat_roster(self) -> GroupchatRoster:
+        return self._roster
+
     def clear(self) -> None:
         log.info('Clear')
 
@@ -144,7 +147,7 @@ class ChatControl(EventHelper):
         self.last_msg_id = None
         self.reset_view()
         self._groupchat_state.clear()
-        self.roster.clear()
+        self._roster.clear()
 
     def switch_contact(self, contact: Union[BareContact,
                                             GroupchatContact,
@@ -161,7 +164,7 @@ class ChatControl(EventHelper):
         self._jump_to_end_button.switch_contact(contact)
         self.conversation_view.switch_contact(contact)
         self._groupchat_state.switch_contact(contact)
-        self.roster.switch_contact(contact)
+        self._roster.switch_contact(contact)
 
         self.encryption = self.get_encryption_state()
         self.conversation_view.encryption_enabled = self.encryption is not None
diff --git a/gajim/gtk/preferences.py b/gajim/gtk/preferences.py
index 772f3f912..bc1d55d95 100644
--- a/gajim/gtk/preferences.py
+++ b/gajim/gtk/preferences.py
@@ -402,21 +402,13 @@ class GroupChats(PreferenceBox):
 
     @staticmethod
     def _on_sort_by_show_in_muc(_value: bool, *args: Any) -> None:
-        # TODO
-        return
-        for ctrl in app.window.get_controls():
-            if ctrl.is_groupchat:
-                if ctrl.roster is not None:
-                    ctrl.roster.invalidate_sort()
+        roster = app.window.get_control().get_group_chat_roster()
+        roster.invalidate_sort()
 
     @staticmethod
     def _on_show_status_in_roster(_value: bool, *args: Any) -> None:
-        # TODO
-        return
-        for ctrl in app.window.get_controls():
-            if ctrl.is_groupchat:
-                if ctrl.roster is not None:
-                    ctrl.roster.draw_contacts()
+        roster = app.window.get_control().get_group_chat_roster()
+        roster.draw_contacts()
 
     @staticmethod
     def _reset_join_left(button: Gtk.Button) -> None: