edu4rdshl/gnome-shell
1
0
Fork 0
mirror of https://github.com/edu4rdshl/gnome-shell.git synced 2026-07-17 23:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

NetworkMenu: make sure menu icons are updated at the end of connectivity checks

Browse source 
Icons inside the menu are updated only for device state change,
but for the main device they also depend on connectivity (which
is a global property).
Add a public method to force an update of the icon, and call it
when connectivity changes.

https://bugzilla.gnome.org/show_bug.cgi?id=726401
This commit is contained in:
Giovanni Campagna 2014-03-15 12:40:13 +01:00
parent 37ef0e4bed
commit 5f4591e24c
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
js/ui/status/network.js
View file

@ -207,13 +207,23 @@ const NMConnectionSection = new Lang.Class({
this.item.menu.addMenuItem(this._labelSection); this.item.menu.addMenuItem(this._labelSection);
this.item.menu.addMenuItem(this._radioSection); this.item.menu.addMenuItem(this._radioSection);
this.connect('icon-changed', Lang.bind(this, this._sync)); this._notifyConnectivityId = this._client.connect('notify::connectivity', Lang.bind(this, this._iconChanged));
}, },
destroy: function() { destroy: function() {
if (this._notifyConnectivityId != 0) {
this._client.disconnect(this._notifyConnectivityId);
this._notifyConnectivityId = 0;
}
this.item.destroy(); this.item.destroy();
}, },
_iconChanged: function() {
this._sync();
this.emit('icon-changed');
},
_sync: function() { _sync: function() {
let nItems = this._connectionItems.size; let nItems = this._connectionItems.size;
@ -278,7 +288,7 @@ const NMConnectionSection = new Lang.Class({
return; return;
item.connect('icon-changed', Lang.bind(this, function() { item.connect('icon-changed', Lang.bind(this, function() {
this.emit('icon-changed'); this._iconChanged();
})); }));
item.connect('activation-failed', Lang.bind(this, function(item, reason) { item.connect('activation-failed', Lang.bind(this, function(item, reason) {
this.emit('activation-failed', reason); this.emit('activation-failed', reason);
@ -523,7 +533,7 @@ const NMDeviceModem = new Lang.Class({
if (this._mobileDevice) { if (this._mobileDevice) {
this._operatorNameId = this._mobileDevice.connect('notify::operator-name', Lang.bind(this, this._sync)); this._operatorNameId = this._mobileDevice.connect('notify::operator-name', Lang.bind(this, this._sync));
this._signalQualityId = this._mobileDevice.connect('notify::signal-quality', Lang.bind(this, function() { this._signalQualityId = this._mobileDevice.connect('notify::signal-quality', Lang.bind(this, function() {
this.emit('icon-changed'); this._iconChanged();
})); }));
} }
}, },
@ -1145,10 +1155,16 @@ const NMDeviceWireless = new Lang.Class({
this._wirelessHwEnabledChangedId = this._client.connect('notify::wireless-hardware-enabled', Lang.bind(this, this._sync)); this._wirelessHwEnabledChangedId = this._client.connect('notify::wireless-hardware-enabled', Lang.bind(this, this._sync));
this._activeApChangedId = this._device.connect('notify::active-access-point', Lang.bind(this, this._activeApChanged)); this._activeApChangedId = this._device.connect('notify::active-access-point', Lang.bind(this, this._activeApChanged));
this._stateChangedId = this._device.connect('state-changed', Lang.bind(this, this._deviceStateChanged)); this._stateChangedId = this._device.connect('state-changed', Lang.bind(this, this._deviceStateChanged));
this._notifyConnectivityId = this._client.connect('notify::connectivity', Lang.bind(this, this._iconChanged));
this._sync(); this._sync();
}, },
_iconChanged: function() {
this._sync();
this.emit('icon-changed');
},
destroy: function() { destroy: function() {
if (this._activeApChangedId) { if (this._activeApChangedId) {
GObject.Object.prototype.disconnect.call(this._device, this._activeApChangedId); GObject.Object.prototype.disconnect.call(this._device, this._activeApChangedId);
@ -1174,6 +1190,10 @@ const NMDeviceWireless = new Lang.Class({
this._dialog.destroy(); this._dialog.destroy();
this._dialog = null; this._dialog = null;
} }
if (this._notifyConnectivityId) {
this._client.disconnect(this._notifyConnectivityId);
this._notifyConnectivityId = 0;
}
this.item.destroy(); this.item.destroy();
}, },
@ -1211,7 +1231,7 @@ const NMDeviceWireless = new Lang.Class({
}, },
_strengthChanged: function() { _strengthChanged: function() {
this.emit('icon-changed'); this._iconChanged();
}, },
_activeApChanged: function() { _activeApChanged: function() {