[gnome-shell] network: Fix the AP strength indicator never getting updated
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] network: Fix the AP strength indicator never getting updated
- Date: Sun, 28 Jul 2013 19:55:50 +0000 (UTC)
commit 8e9e583b7929d40a55ed00112ec6d7e654879fff
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Jul 16 17:46:09 2013 -0400
network: Fix the AP strength indicator never getting updated
I intended to make a few code cleanups, but I apparently forgot
to hook up _updateAccessPoint. Merge it with _activeApChanged,
which is where the notify::active-access-point signal is actually
hooked up to.
https://bugzilla.gnome.org/show_bug.cgi?id=704670
js/ui/status/network.js | 52 ++++++++++++++++++++--------------------------
1 files changed, 23 insertions(+), 29 deletions(-)
---
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 221863b..98ba728 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -777,6 +777,11 @@ const NMDeviceWireless = new Lang.Class({
this._apRemovedId = 0;
}
+ if (this._strengthChangedId) {
+ this._activeAccessPoint.disconnect(this._strengthChangedId);
+ this._strengthChangedId = 0;
+ }
+
this.parent();
},
@@ -806,18 +811,31 @@ const NMDeviceWireless = new Lang.Class({
},
_activeApChanged: function() {
- this._activeNetwork = null;
+ let ap = this._device.active_access_point;
+ if (this._activeAccessPoint == ap)
+ return;
- let activeAp = this._device.active_access_point;
+ if (this._activeAccessPoint) {
+ this._activeAccessPoint.disconnect(this._strengthChangedId);
+ this._strengthChangedId = 0;
+ }
- if (activeAp) {
- let res = this._findExistingNetwork(activeAp);
+ this._activeAccessPoint = ap;
+
+ if (this._activeAccessPoint) {
+ this._strengthChangedId = this._activeAccessPoint.connect('notify::strength',
+ Lang.bind(this,
this._strengthChanged));
+ let res = this._findExistingNetwork(activeAp);
if (res != null)
this._activeNetwork = this._networks[res.network];
}
- // we don't refresh the view here, _activeConnectionChanged will
+ this.emit('icon-changed');
+ },
+
+ _strengthChanged: function() {
+ this.emit('icon-changed');
},
_getApSecurityType: function(accessPoint) {
@@ -1217,30 +1235,6 @@ const NMDeviceWireless = new Lang.Class({
}
},
- _updateAccessPoint: function() {
- let ap = this._device.active_access_point;
- if (this._activeAccessPoint == ap)
- return;
-
- if (this._activeAccessPoint) {
- this._activeAccessPoint.disconnect(this._strengthChangedId);
- this._strengthChangedId = 0;
- }
-
- this._activeAccessPoint = ap;
-
- if (this._activeAccessPoint) {
- this._strengthChangedId = this._activeAccessPoint.connect('notify::strength',
- Lang.bind(this,
this._strengthChanged));
- }
-
- this._syncStatusLabel();
- },
-
- _strengthChanged: function() {
- this.emit('icon-changed');
- },
-
getIndicatorIcon: function() {
if (this._device.active_connection.state == NetworkManager.ActiveConnectionState.ACTIVATING)
return 'network-wireless-acquiring-symbolic';
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]