brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

network: Remove superfluous intermediate section

Browse Source 
Now that we're guaranteed this.menu is a section, this is
excessive and unnecessary.

https://bugzilla.gnome.org/show_bug.cgi?id=705845
This commit is contained in:
Jasper St. Pierre 2013-06-07 13:23:57 -04:00
parent 4ba6791043
commit c05627a49e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/ui/status/network.js
View File

@ -1204,25 +1204,22 @@ const NMApplet = new Lang.Class({
this._nmDevices = []; this._nmDevices = [];
this._devices = { }; this._devices = { };
this._section = new PopupMenu.PopupMenuSection();
this.menu.addMenuItem(this._section);
this._devices.wireless = { this._devices.wireless = {
section: new PopupMenu.PopupMenuSection(), section: new PopupMenu.PopupMenuSection(),
devices: [ ], devices: [ ],
}; };
this._section.addMenuItem(this._devices.wireless.section); this.menu.addMenuItem(this._devices.wireless.section);
this._devices.wwan = { this._devices.wwan = {
section: new PopupMenu.PopupMenuSection(), section: new PopupMenu.PopupMenuSection(),
devices: [ ], devices: [ ],
}; };
this._section.addMenuItem(this._devices.wwan.section); this.menu.addMenuItem(this._devices.wwan.section);
this._vpnSection = new NMVPNSection(this._client); this._vpnSection = new NMVPNSection(this._client);
this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed)); this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed));
this._vpnSection.connect('icon-changed', Lang.bind(this, this._updateIcon)); 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._readConnections();
this._readDevices(); this._readDevices();
@ -1242,7 +1239,7 @@ const NMApplet = new Lang.Class({
_sessionUpdated: function() { _sessionUpdated: function() {
let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter; let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
this._section.setSensitive(sensitive); this.menu.setSensitive(sensitive);
}, },
_ensureSource: function() { _ensureSource: function() {
@ -1583,7 +1580,7 @@ const NMApplet = new Lang.Class({
this._syncActiveConnections(); this._syncActiveConnections();
this.indicators.visible = this._client.manager_running; 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() { _updateIcon: function() {