[gnome-shell/eos3.8: 4/255] bluetooth: Be consistent when determining whether Bluetooth is off

[Matthew Leeds <mwleeds src gnome org>]

commit 75d5d793529d4d7fe46ceba972d144cd1f684613
Author: Mario Sanchez Prada <mario endlessm com>
Date:   Tue Oct 17 18:57:12 2017 +0200

    bluetooth: Be consistent when determining whether Bluetooth is off
    
    It would be nice if we could use the same exact condition to decide
    whether to show "Off"/"Turn On" vs "On"/"Turn Off" in the menu, since
    otherwise we risk showing inconsistent states in each place if.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=789110

 js/ui/status/bluetooth.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index 957669dbb0..97a72bea89 100644
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -124,14 +124,17 @@ class Indicator extends PanelMenu.SystemIndicator {
         else
             this._item.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
 
+        // Bluetooth will be considered 'Off' if either the adapter
+        // is not available or it's set in irplane mode.
+        let isBluetoothOff = nConnectedDevices == -1 || this._proxy.BluetoothAirplaneMode;
         if (nConnectedDevices > 0)
             /* Translators: this is the number of connected bluetooth devices */
             this._item.label.text = ngettext("%d Connected", "%d Connected", 
nConnectedDevices).format(nConnectedDevices);
-        else if (nConnectedDevices == -1)
+        else if (isBluetoothOff)
             this._item.label.text = _("Off");
         else
             this._item.label.text = _("On");
 
-        this._toggleItem.label.text = this._proxy.BluetoothAirplaneMode ? _("Turn On") : _("Turn Off");
+        this._toggleItem.label.text = isBluetoothOff ? _("Turn On") : _("Turn Off");
     }
 });