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

network: Merge NMConnectionBased back into NMDevice

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=701954
This commit is contained in:
Jasper St. Pierre 2013-04-26 19:28:48 -04:00
parent 7ae7f046c2
commit 6ef2d4a4cc
1 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,13 +166,37 @@ const NMWirelessSectionTitleMenuItem = new Lang.Class({
} }
}); });
const NMConnectionBased = new Lang.Class({ const NMDevice = new Lang.Class({
Name: 'NMConnectionBased', Name: 'NMDevice',
Abstract: true, Abstract: true,
_init: function(connections) { _init: function(client, device, connections) {
this._connections = [ ]; this._client = client;
this._setDevice(device);
this._connections = [];
connections.forEach(Lang.bind(this, this.checkConnection)); 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) { checkConnection: function(connection) {
@ -248,40 +272,6 @@ const NMConnectionBased = new Lang.Class({
return two.timestamp - one.timestamp; 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() { destroy: function() {
this._setDevice(null); this._setDevice(null);
@ -547,6 +537,7 @@ const NMDevice = new Lang.Class({
this.emit('state-changed'); this.emit('state-changed');
} }
}); });
Signals.addSignalMethods(NMDevice.prototype);
const NMDeviceSimple = new Lang.Class({ const NMDeviceSimple = new Lang.Class({
Name: 'NMDeviceSimple', Name: 'NMDeviceSimple',