[gnome-shell] status/volume: Use (dis)connectObject
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] status/volume: Use (dis)connectObject
- Date: Tue, 19 Jul 2022 13:06:31 +0000 (UTC)
commit cf404f76c0c299b8044c97ed884c0d03f170c729
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Jul 15 14:30:49 2022 +0200
status/volume: Use (dis)connectObject
It makes sense to use this for all MixerControl handlers, not just
some of them.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2380>
js/ui/status/volume.js | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index 2aa3f0c5cd..1babc440e7 100644
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -81,8 +81,7 @@ var StreamSlider = class extends Signals.EventEmitter {
}
set stream(stream) {
- if (this._stream)
- this._disconnectStream(this._stream);
+ this._stream?.disconnectObject(this);
this._stream = stream;
@@ -96,10 +95,6 @@ var StreamSlider = class extends Signals.EventEmitter {
this._updateVisibility();
}
- _disconnectStream(stream) {
- stream.disconnectObject(this);
- }
-
_connectStream(stream) {
stream.connectObject(
'notify::is-muted', this._updateVolume.bind(this),
@@ -269,8 +264,12 @@ var InputStreamSlider = class extends StreamSlider {
constructor(control) {
super(control);
this._slider.accessible_name = _("Microphone");
- this._control.connect('stream-added', this._maybeShowInput.bind(this));
- this._control.connect('stream-removed', this._maybeShowInput.bind(this));
+
+ this._control.connectObject(
+ 'stream-added', () => this._maybeShowInput(),
+ 'stream-removed', () => this._maybeShowInput(),
+ this);
+
this._icon.icon_name = 'audio-input-microphone-symbolic';
this._icons = [
'microphone-sensitivity-muted-symbolic',
@@ -316,9 +315,11 @@ var VolumeMenu = class extends PopupMenu.PopupMenuSection {
this.hasHeadphones = false;
this._control = control;
- this._control.connect('state-changed', this._onControlStateChanged.bind(this));
- this._control.connect('default-sink-changed', this._readOutput.bind(this));
- this._control.connect('default-source-changed', this._readInput.bind(this));
+ this._control.connectObject(
+ 'state-changed', () => this._onControlStateChanged(),
+ 'default-sink-changed', () => this._readOutput(),
+ 'default-source-changed', () => this._readInput(),
+ this);
this._output = new OutputStreamSlider(this._control);
this._output.connect('stream-updated',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]