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

Commits: d01f9ab6 by lovetox at 2022-06-28T23:18:21+02:00 Remove obsolete code

- - - - -

2 changed files:

- gajim/gtk/controls/base.py - gajim/gui_interface.py

Changes:

===================================== gajim/gtk/controls/base.py ===================================== @@ -359,28 +359,6 @@ def _update_toolbar(self) -> None: Derived types MAY implement this """

- def set_session(self, session): - oldsession = None - if hasattr(self, 'session'): - oldsession = self.session - - if oldsession and session == oldsession: - return - - self.session = session - - if session: - session.control = self - - if session and oldsession: - oldsession.control = None - - def remove_session(self, session): - if session != self.session: - return - self.session.control = None - self.session = None - def _nec_ping(self, obj): raise NotImplementedError

@@ -885,18 +863,3 @@ def has_focus(self) -> bool: if self == app.window.get_active_control(): return True return False - - -class ScrolledWindow(Gtk.ScrolledWindow): - def __init__(self, *args: Any, **kwargs: Any) -> None: - Gtk.ScrolledWindow.__init__(self, *args, **kwargs) - - self.set_overlay_scrolling(False) - self.set_max_content_height(100) - self.set_propagate_natural_height(True) - self.get_style_context().add_class('scrolled-no-border') - self.get_style_context().add_class('no-scroll-indicator') - self.get_style_context().add_class('scrollbar-style') - self.get_style_context().add_class('one-line-scrollbar') - self.set_shadow_type(Gtk.ShadowType.IN) - self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)

===================================== gajim/gui_interface.py ===================================== @@ -125,7 +125,6 @@ def _create_core_handlers_list(self) -> None: # pylint: disable=line-too-long self.handlers = { 'signed-in': [self.handle_event_signed_in], - 'presence-received': [self.handle_event_presence], 'message-sent': [self.handle_event_msgsent], 'message-not-sent': [self.handle_event_msgnotsent], } @@ -166,14 +165,6 @@ def handle_event_signed_in(event): if app.settings.get('ask_online_status'): app.window.show_account_page(account)

- def handle_event_presence(self, event): - account = event.conn.name - jid = event.jid - - ctrl = app.window.get_control(account, jid) - if ctrl and ctrl.session and len(event.contact_list) > 1: - ctrl.remove_session(ctrl.session) - @staticmethod def handle_event_msgsent(event): if not event.play_sound:

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