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

network: Remove dead code

Browse Source 
No class in here has this.carrier as a property. Presumably, this was
meant to be this.device.carrier, but since this code is going to be
rewritten soon anyway, might as well just junk the never-working
code for now.

https://bugzilla.gnome.org/show_bug.cgi?id=701954
This commit is contained in:
Jasper St. Pierre 2013-06-12 14:38:20 -04:00
parent 719d793e22
commit 9520880568
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,10 +316,6 @@ const NMDevice = new Lang.Class({
GObject.Object.prototype.disconnect.call(this.device, this._activeConnectionChangedId); GObject.Object.prototype.disconnect.call(this.device, this._activeConnectionChangedId);
this._stateChangedId = 0; this._stateChangedId = 0;
} }
if (this._carrierChangedId) {
GObject.Object.prototype.disconnect.call(this.device, this._carrierChangedId);
this._carrierChangedId = 0;
}
if (this._firmwareChangedId) { if (this._firmwareChangedId) {
GObject.Object.prototype.disconnect.call(this.device, this._firmwareChangedId); GObject.Object.prototype.disconnect.call(this.device, this._firmwareChangedId);
this._firmwareChangedId = 0; this._firmwareChangedId = 0;
@ -414,8 +410,8 @@ const NMDevice = new Lang.Class({
return _("authentication required"); return _("authentication required");
case NetworkManager.DeviceState.UNAVAILABLE: case NetworkManager.DeviceState.UNAVAILABLE:
// This state is actually a compound of various states (generically unavailable, // This state is actually a compound of various states (generically unavailable,
// firmware missing, carrier not available), that are exposed by different properties // firmware missing), that are exposed by different properties (whose state may
// (whose state may or may not updated when we receive state-changed). // or may not updated when we receive state-changed).
if (!this._firmwareChangedId) if (!this._firmwareChangedId)
this._firmwareChangedId = this.device.connect('notify::firmware-missing', Lang.bind(this, this._substateChanged)); this._firmwareChangedId = this.device.connect('notify::firmware-missing', Lang.bind(this, this._substateChanged));
if (this.device.firmware_missing) { if (this.device.firmware_missing) {
@ -423,14 +419,6 @@ const NMDevice = new Lang.Class({
module, which is missing */ module, which is missing */
return _("firmware missing"); return _("firmware missing");
} }
if (this.device.capabilities & NetworkManager.DeviceCapabilities.CARRIER_DETECT) {
if (!this._carrierChangedId)
this._carrierChangedId = this.device.connect('notify::carrier', Lang.bind(this, this._substateChanged));
if (!this.carrier) {
/* Translators: this is for wired network devices that are physically disconnected */
return _("cable unplugged");
}
}
/* Translators: this is for a network device that cannot be activated (for example it /* Translators: this is for a network device that cannot be activated (for example it
is disabled by rfkill, or it has no coverage */ is disabled by rfkill, or it has no coverage */
return _("unavailable"); return _("unavailable");
@ -543,11 +531,6 @@ const NMDevice = new Lang.Class({
}, },
_updateStatusItem: function() { _updateStatusItem: function() {
if (this._carrierChangedId) {
// see above for why this is needed
GObject.Object.prototype.disconnect.call(this.device, this._carrierChangedId);
this._carrierChangedId = 0;
}
if (this._firmwareChangedId) { if (this._firmwareChangedId) {
GObject.Object.prototype.disconnect.call(this.device, this._firmwareChangedId); GObject.Object.prototype.disconnect.call(this.device, this._firmwareChangedId);
this._firmwareChangedId = 0; this._firmwareChangedId = 0;