From c05627a49ec8ba210c09049ddf00092448c7908a Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 7 Jun 2013 13:23:57 -0400 Subject: [PATCH] network: Remove superfluous intermediate section Now that we're guaranteed this.menu is a section, this is excessive and unnecessary. https://bugzilla.gnome.org/show_bug.cgi?id=705845 --- js/ui/status/network.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/js/ui/status/network.js b/js/ui/status/network.js index 9c03eeb7c..9be93b150 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js @@ -1204,25 +1204,22 @@ const NMApplet = new Lang.Class({ this._nmDevices = []; this._devices = { }; - this._section = new PopupMenu.PopupMenuSection(); - this.menu.addMenuItem(this._section); - this._devices.wireless = { section: new PopupMenu.PopupMenuSection(), devices: [ ], }; - this._section.addMenuItem(this._devices.wireless.section); + this.menu.addMenuItem(this._devices.wireless.section); this._devices.wwan = { section: new PopupMenu.PopupMenuSection(), devices: [ ], }; - this._section.addMenuItem(this._devices.wwan.section); + this.menu.addMenuItem(this._devices.wwan.section); this._vpnSection = new NMVPNSection(this._client); this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed)); this._vpnSection.connect('icon-changed', Lang.bind(this, this._updateIcon)); - this._section.addMenuItem(this._vpnSection.item); + this.menu.addMenuItem(this._vpnSection.item); this._readConnections(); this._readDevices(); @@ -1242,7 +1239,7 @@ const NMApplet = new Lang.Class({ _sessionUpdated: function() { let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter; - this._section.setSensitive(sensitive); + this.menu.setSensitive(sensitive); }, _ensureSource: function() { @@ -1583,7 +1580,7 @@ const NMApplet = new Lang.Class({ this._syncActiveConnections(); this.indicators.visible = this._client.manager_running; - this._section.actor.visible = this._client.networking_enabled; + this.menu.actor.visible = this._client.networking_enabled; }, _updateIcon: function() {