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

network: Remove syncDescription

Browse Source 
Replace it with setDeviceDescription, which gives device wrappers
more control about how to handle description changes.

https://bugzilla.gnome.org/show_bug.cgi?id=704670
This commit is contained in:
Jasper St. Pierre 2013-07-17 01:01:44 -04:00
parent 246271fd9d
commit 6827dacb4b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,6 +179,7 @@ const NMConnectionSection = new Lang.Class({
this.item.status.text = this._getStatus(); this.item.status.text = this._getStatus();
this.item.icon.icon_name = this._getMenuIcon(); this.item.icon.icon_name = this._getMenuIcon();
this.item.label.text = this._getDescription();
}, },
_getStatus: function() { _getStatus: function() {
@ -211,10 +212,6 @@ const NMConnectionSection = new Lang.Class({
return new NMConnectionItem(this, connection); return new NMConnectionItem(this, connection);
}, },
syncDescription: function() {
this.item.label.text = this._getDescription();
},
checkConnection: function(connection) { checkConnection: function(connection) {
if (!this._connectionValid(connection)) if (!this._connectionValid(connection))
return; return;
@ -328,8 +325,13 @@ const NMConnectionDevice = new Lang.Class({
this._device.disconnect(null); this._device.disconnect(null);
}, },
setDeviceDescription: function(desc) {
this._description = desc;
this._sync();
},
_getDescription: function() { _getDescription: function() {
return this._device._description; return this._description;
}, },
_sync: function() { _sync: function() {
@ -574,8 +576,6 @@ const NMVPNSection = new Lang.Class({
_init: function(client) { _init: function(client) {
this.parent(client); this.parent(client);
this.syncDescription();
this._sync(); this._sync();
}, },
@ -768,9 +768,9 @@ const NMApplet = new Lang.Class({
let names = NMGtk.utils_disambiguate_device_names(this._nmDevices); let names = NMGtk.utils_disambiguate_device_names(this._nmDevices);
for (let i = 0; i < this._nmDevices.length; i++) { for (let i = 0; i < this._nmDevices.length; i++) {
let device = this._nmDevices[i]; let device = this._nmDevices[i];
device._description = names[i]; let description = names[i];
if (device._delegate) if (device._delegate)
device._delegate.syncDescription(); device._delegate.setDeviceDescription(description);
} }
}, },