[gnome-shell] network: Merge NMConnectionBased back into NMDevice
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] network: Merge NMConnectionBased back into NMDevice
- Date: Fri, 14 Jun 2013 18:17:19 +0000 (UTC)
commit 6ef2d4a4cc9743240bb25927e72399a3dde80c5a
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Apr 26 19:28:48 2013 -0400
network: Merge NMConnectionBased back into NMDevice
https://bugzilla.gnome.org/show_bug.cgi?id=701954
js/ui/status/network.js | 67 ++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 38 deletions(-)
---
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 5ecb2cc..dae8a69 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -166,13 +166,37 @@ const NMWirelessSectionTitleMenuItem = new Lang.Class({
}
});
-const NMConnectionBased = new Lang.Class({
- Name: 'NMConnectionBased',
+const NMDevice = new Lang.Class({
+ Name: 'NMDevice',
Abstract: true,
- _init: function(connections) {
- this._connections = [ ];
+ _init: function(client, device, connections) {
+ this._client = client;
+ this._setDevice(device);
+
+ this._connections = [];
connections.forEach(Lang.bind(this, this.checkConnection));
+
+ this._activeConnection = null;
+ this._activeConnectionItem = null;
+ this._overflowItem = null;
+
+ this.statusItem = new PopupMenu.PopupSwitchMenuItem('', this.connected, { style_class:
'popup-subtitle-menu-item' });
+ this._statusChanged = this.statusItem.connect('toggled', Lang.bind(this, function(item, state) {
+ let ok;
+ if (state)
+ ok = this.activate();
+ else
+ ok = this.deactivate();
+
+ if (!ok)
+ item.setToggleState(!state);
+ }));
+
+ this._updateStatusItem();
+ this.section = new PopupMenu.PopupMenuSection();
+
+ this._deferredWorkId = Main.initializeDeferredWork(this.section.actor, Lang.bind(this,
this._createSection));
},
checkConnection: function(connection) {
@@ -248,40 +272,6 @@ const NMConnectionBased = new Lang.Class({
return two.timestamp - one.timestamp;
},
-});
-Signals.addSignalMethods(NMConnectionBased.prototype);
-
-const NMDevice = new Lang.Class({
- Name: 'NMDevice',
- Abstract: true,
- Extends: NMConnectionBased,
-
- _init: function(client, device, connections) {
- this._client = client;
- this._setDevice(device);
- this.parent(connections);
-
- this._activeConnection = null;
- this._activeConnectionItem = null;
- this._overflowItem = null;
-
- this.statusItem = new PopupMenu.PopupSwitchMenuItem('', this.connected, { style_class:
'popup-subtitle-menu-item' });
- this._statusChanged = this.statusItem.connect('toggled', Lang.bind(this, function(item, state) {
- let ok;
- if (state)
- ok = this.activate();
- else
- ok = this.deactivate();
-
- if (!ok)
- item.setToggleState(!state);
- }));
-
- this._updateStatusItem();
- this.section = new PopupMenu.PopupMenuSection();
-
- this._deferredWorkId = Main.initializeDeferredWork(this.section.actor, Lang.bind(this,
this._createSection));
- },
destroy: function() {
this._setDevice(null);
@@ -547,6 +537,7 @@ const NMDevice = new Lang.Class({
this.emit('state-changed');
}
});
+Signals.addSignalMethods(NMDevice.prototype);
const NMDeviceSimple = new Lang.Class({
Name: 'NMDeviceSimple',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]