From 1a4948f0f2ef0c3c17f3b116fdf5bdaa9268741b Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 19 Dec 2012 22:46:50 -0500 Subject: [PATCH] volume: Pick up hasHeadphones from the signal handler A preliminary patch for big cleanups happening soon. https://bugzilla.gnome.org/show_bug.cgi?id=690539 --- js/ui/status/volume.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js index 859b403ca..b1774fc88 100644 --- a/js/ui/status/volume.js +++ b/js/ui/status/volume.js @@ -33,7 +33,7 @@ const VolumeMenu = new Lang.Class({ _init: function(control) { this.parent(); - this.hasHeadphones = false; + this._hasHeadphones = false; this._control = control; this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged)); @@ -100,8 +100,8 @@ const VolumeMenu = new Lang.Class({ }, _portChanged: function() { - this.hasHeadphones = this._findHeadphones(this._output); - this.emit('headphones-changed'); + this._hasHeadphones = this._findHeadphones(this._output); + this.emit('headphones-changed', this._hasHeadphones); }, _readOutput: function() { @@ -231,8 +231,8 @@ const Indicator = new Lang.Class({ this.actor.visible = (icon != null); this.setIcon(icon); })); - this._volumeMenu.connect('headphones-changed', Lang.bind(this, function() { - this._headphoneIcon.visible = this._volumeMenu.hasHeadphones; + this._volumeMenu.connect('headphones-changed', Lang.bind(this, function(menu, value) { + this._headphoneIcon.visible = value; })); this._headphoneIcon = this.addIcon(new Gio.ThemedIcon({ name: 'headphones-symbolic' }));