js: Use (dis)connectObject()
Start using the new methods to simplify signal cleanup. For now, focus on replacing existing cleanups; in most cases this means signals connected in the constructor and disconnected on destroy, but also other cases with a similarly defined lifetime (say: from show to hide). This doesn't change signal connections that only exist for a short time (say: once), handlers that are connected on-demand (say: the first time a particular method is called), or connections that aren't tracked (read: disconnected) at all. We will eventually replace the latter with connectObject() as well - especially from actor subclasses - but the changeset is already big enough as-is :-) Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1953>
This commit is contained in:

committed by
Marge Bot

parent
f45ccc9143
commit
26235bbe54
@ -112,8 +112,8 @@ const TouchpadSwipeGesture = GObject.registerClass({
|
||||
schema_id: 'org.gnome.desktop.peripherals.touchpad',
|
||||
});
|
||||
|
||||
this._stageCaptureEvent =
|
||||
global.stage.connect('captured-event::touchpad', this._handleEvent.bind(this));
|
||||
global.stage.connectObject(
|
||||
'captured-event::touchpad', this._handleEvent.bind(this), this);
|
||||
}
|
||||
|
||||
_handleEvent(actor, event) {
|
||||
@ -203,10 +203,7 @@ const TouchpadSwipeGesture = GObject.registerClass({
|
||||
}
|
||||
|
||||
destroy() {
|
||||
if (this._stageCaptureEvent) {
|
||||
global.stage.disconnect(this._stageCaptureEvent);
|
||||
delete this._stageCaptureEvent;
|
||||
}
|
||||
global.stage.disconnectObject(this);
|
||||
}
|
||||
});
|
||||
|
||||
|
Reference in New Issue
Block a user