From 777c7a952b8f47f0370bdf4cb30924b84795ef33 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Thu, 3 Oct 2013 14:31:58 +0200
Subject: [PATCH] NetworkMenu/NMDeviceModem: fix status texts for airplane mode

Show "Hardware Disabled" when disabled by HW switch, and
generically "Disabled" when airplane mode is active, as
indicated by v4 mockups.
Note that bluetooth is not affected by NM handling of airplane
mode (and generally the firmware makes the USB bluetooth
adapter disappear when rfkilled), so this is in NMDeviceModem
instead of NMConnectionDevice.

https://bugzilla.gnome.org/show_bug.cgi?id=709043
---
 js/ui/status/network.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index c81e94c01..1dffb3a87 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -460,6 +460,17 @@ const NMDeviceModem = new Lang.Class({
         this.parent();
     },
 
+    _getStatus: function() {
+        if (!this._client.wwan_hardware_enabled)
+            return _("Hardware Disabled");
+        else if (!this._client.wwan_enabled)
+            /* Translators: this is for a network device that cannot be activated
+               because it's disabled by rfkill (airplane mode) */
+            return _("Disabled");
+        else
+            return this.parent();
+    },
+
     _getMenuIcon: function() {
         if (this._device.active_connection)
             return this.getIndicatorIcon();