Philipp Hörist pushed to branch newcontrol at gajim / gajim
Commits:
-
d01f9ab6
by lovetox at 2022-06-28T23:18:21+02:00
2 changed files:
Changes:
| ... | ... | @@ -359,28 +359,6 @@ def _update_toolbar(self) -> None: |
| 359 | 359 | Derived types MAY implement this
|
| 360 | 360 | """
|
| 361 | 361 | |
| 362 | - def set_session(self, session):
|
|
| 363 | - oldsession = None
|
|
| 364 | - if hasattr(self, 'session'):
|
|
| 365 | - oldsession = self.session
|
|
| 366 | - |
|
| 367 | - if oldsession and session == oldsession:
|
|
| 368 | - return
|
|
| 369 | - |
|
| 370 | - self.session = session
|
|
| 371 | - |
|
| 372 | - if session:
|
|
| 373 | - session.control = self
|
|
| 374 | - |
|
| 375 | - if session and oldsession:
|
|
| 376 | - oldsession.control = None
|
|
| 377 | - |
|
| 378 | - def remove_session(self, session):
|
|
| 379 | - if session != self.session:
|
|
| 380 | - return
|
|
| 381 | - self.session.control = None
|
|
| 382 | - self.session = None
|
|
| 383 | - |
|
| 384 | 362 | def _nec_ping(self, obj):
|
| 385 | 363 | raise NotImplementedError
|
| 386 | 364 | |
| ... | ... | @@ -885,18 +863,3 @@ def has_focus(self) -> bool: |
| 885 | 863 | if self == app.window.get_active_control():
|
| 886 | 864 | return True
|
| 887 | 865 | return False |
| 888 | - |
|
| 889 | - |
|
| 890 | -class ScrolledWindow(Gtk.ScrolledWindow):
|
|
| 891 | - def __init__(self, *args: Any, **kwargs: Any) -> None:
|
|
| 892 | - Gtk.ScrolledWindow.__init__(self, *args, **kwargs)
|
|
| 893 | - |
|
| 894 | - self.set_overlay_scrolling(False)
|
|
| 895 | - self.set_max_content_height(100)
|
|
| 896 | - self.set_propagate_natural_height(True)
|
|
| 897 | - self.get_style_context().add_class('scrolled-no-border')
|
|
| 898 | - self.get_style_context().add_class('no-scroll-indicator')
|
|
| 899 | - self.get_style_context().add_class('scrollbar-style')
|
|
| 900 | - self.get_style_context().add_class('one-line-scrollbar')
|
|
| 901 | - self.set_shadow_type(Gtk.ShadowType.IN)
|
|
| 902 | - self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) |
| ... | ... | @@ -125,7 +125,6 @@ def _create_core_handlers_list(self) -> None: |
| 125 | 125 | # pylint: disable=line-too-long
|
| 126 | 126 | self.handlers = {
|
| 127 | 127 | 'signed-in': [self.handle_event_signed_in],
|
| 128 | - 'presence-received': [self.handle_event_presence],
|
|
| 129 | 128 | 'message-sent': [self.handle_event_msgsent],
|
| 130 | 129 | 'message-not-sent': [self.handle_event_msgnotsent],
|
| 131 | 130 | }
|
| ... | ... | @@ -166,14 +165,6 @@ def handle_event_signed_in(event): |
| 166 | 165 | if app.settings.get('ask_online_status'):
|
| 167 | 166 | app.window.show_account_page(account)
|
| 168 | 167 | |
| 169 | - def handle_event_presence(self, event):
|
|
| 170 | - account = event.conn.name
|
|
| 171 | - jid = event.jid
|
|
| 172 | - |
|
| 173 | - ctrl = app.window.get_control(account, jid)
|
|
| 174 | - if ctrl and ctrl.session and len(event.contact_list) > 1:
|
|
| 175 | - ctrl.remove_session(ctrl.session)
|
|
| 176 | - |
|
| 177 | 168 | @staticmethod
|
| 178 | 169 | def handle_event_msgsent(event):
|
| 179 | 170 | if not event.play_sound:
|