From 7e857dede302cbf3aa88a9a0a792f9337671eee6 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 19 Apr 2011 09:31:54 -0400 Subject: [PATCH] network: add a few more states to getStatusLabel() The IP_CHECK and SECONDARIES states should be considered part of the "connecting..." phase. DEACTIVATING should be its own stage, but that would break string freeze, so we just treat it like DISCONNECTED for now. UNMANAGED needs to be treated differently in 3.2, but it is too late to fix it for 3.0.1. https://bugzilla.gnome.org/show_bug.cgi?id=646946 --- js/ui/status/network.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/ui/status/network.js b/js/ui/status/network.js index 48a7a1668..6fa564223 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js @@ -513,11 +513,14 @@ NMDevice.prototype = { switch(this.device.state) { case NetworkManager.DeviceState.UNMANAGED: case NetworkManager.DeviceState.DISCONNECTED: + case NetworkManager.DeviceState.DEACTIVATING: case NetworkManager.DeviceState.ACTIVATED: return null; case NetworkManager.DeviceState.PREPARE: case NetworkManager.DeviceState.CONFIG: case NetworkManager.DeviceState.IP_CONFIG: + case NetworkManager.DeviceState.IP_CHECK: + case NetworkManager.DeviceState.SECONDARIES: return _("connecting..."); case NetworkManager.DeviceState.NEED_AUTH: /* Translators: this is for network connections that require some kind of key or password */