network: Remove the firmware changed signal

According to Dan Williams, if firmware is installed the device
will disappear and reappear, and this is unlikely to change any
time soon. Just make our lives easier by removing the tracking.

https://bugzilla.gnome.org/show_bug.cgi?id=704670
This commit is contained in:
Jasper St. Pierre 2013-07-16 18:59:00 -04:00
parent 8e9e583b79
commit f8225141dc

View File

@ -306,10 +306,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._firmwareChangedId) {
GObject.Object.prototype.disconnect.call(this._device, this._firmwareChangedId);
this._firmwareChangedId = 0;
}
this._device = null; this._device = null;
} }
@ -375,14 +371,6 @@ const NMDevice = new Lang.Class({
// in the majority of cases (wired, wwan) // in the majority of cases (wired, wwan)
}, },
_firmwareChanged: function() {
if (this._firmwareChangedId) {
GObject.Object.prototype.disconnect.call(this._device, this._firmwareChangedId);
this._firmwareChangedId = 0;
}
this._substateChanged();
},
getStatusLabel: function() { getStatusLabel: function() {
if (!this._device) if (!this._device)
return null; return null;
@ -411,9 +399,6 @@ const NMDevice = new Lang.Class({
// firmware missing), that are exposed by different properties (whose state may // firmware missing), that are exposed by different properties (whose state may
// or may not updated when we receive state-changed). // or may not updated when we receive state-changed).
if (this._device.firmware_missing) { if (this._device.firmware_missing) {
if (!this._firmwareChangedId)
this._firmwareChangedId = this._device.connect('notify::firmware-missing', Lang.bind(this, this._firmwareChanged));
/* Translators: this is for devices that require some kind of firmware or kernel /* Translators: this is for devices that require some kind of firmware or kernel
module, which is missing */ module, which is missing */
return _("firmware missing"); return _("firmware missing");