From 66da3f566805cb0891e34e8673eb6056047bfcc3 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 19 Dec 2012 22:46:11 -0500 Subject: [PATCH] volume: Don't have a separate syncVisibility method With it doing less now, we can simply do it inline. https://bugzilla.gnome.org/show_bug.cgi?id=690539 --- js/ui/status/volume.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js index 9f65d71eb..859b403ca 100644 --- a/js/ui/status/volume.js +++ b/js/ui/status/volume.js @@ -228,12 +228,11 @@ const Indicator = new Lang.Class({ this._volumeMenu = new VolumeMenu(this._control); this._volumeMenu.connect('icon-changed', Lang.bind(this, function(menu) { let icon = this._volumeMenu.getIcon(); - this._hasPulseAudio = icon != null; + this.actor.visible = (icon != null); this.setIcon(icon); - this._syncVisibility(); })); this._volumeMenu.connect('headphones-changed', Lang.bind(this, function() { - this._syncVisibility(); + this._headphoneIcon.visible = this._volumeMenu.hasHeadphones; })); this._headphoneIcon = this.addIcon(new Gio.ThemedIcon({ name: 'headphones-symbolic' })); @@ -247,11 +246,6 @@ const Indicator = new Lang.Class({ this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent)); }, - _syncVisibility: function() { - this.actor.visible = this._hasPulseAudio; - this._headphoneIcon.visible = this._volumeMenu.hasHeadphones; - }, - _onScrollEvent: function(actor, event) { this._volumeMenu.scroll(event); }