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.

https://bugzilla.gnome.org/show_bug.cgi?id=789110

js/ui/closeDialog.js

@@ -2,6 +2,7 @@
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
@@ -13,6 +14,7 @@ const Tweener = imports.ui.tweener;
 
 var FROZEN_WINDOW_BRIGHTNESS = -0.3
 var DIALOG_TRANSITION_TIME = 0.15
+var ALIVE_TIMEOUT = 5000;
 
 var CloseDialog = new Lang.Class({
     Name: 'CloseDialog',
@@ -26,6 +28,7 @@ var CloseDialog = new Lang.Class({
         this.parent();
         this._window = window;
         this._dialog = null;
+        this._timeoutId = 0;
     },
 
     get window() {
@@ -97,6 +100,14 @@ var CloseDialog = new Lang.Class({
         if (this._dialog != null)
             return;
 
+        Meta.disable_unredirect_for_screen(global.screen);
+
+        this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, ALIVE_TIMEOUT,
+            () => {
+                this._window.check_alive(global.display.get_current_time_roundtrip());
+                return GLib.SOURCE_CONTINUE;
+            });
+
         this._addWindowEffect();
         this._initDialog();
 
@@ -117,6 +128,11 @@ var CloseDialog = new Lang.Class({
         if (this._dialog == null)
             return;
 
+        Meta.enable_unredirect_for_screen(global.screen);
+
+        GLib.source_remove(this._timeoutId);
+        this._timeoutId = 0;
+
         let dialog = this._dialog;
         this._dialog = null;
         this._removeWindowEffect();

js/ui/status/bluetooth.js

@@ -132,14 +132,17 @@ var Indicator = new Lang.Class({
         else
             this._item.actor.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
 
+        // Bluetooth will be considered 'Off' if either the adapter
+        // is not available or it's set in airplane 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");
     },
 });

src/st/st-label.c

@@ -180,6 +180,7 @@ st_label_dispose (GObject   *object)
 {
   StLabelPrivate *priv = ST_LABEL (object)->priv;
 
+  priv->label = NULL;
   g_clear_pointer (&priv->text_shadow_pipeline, cogl_object_unref);
 
   G_OBJECT_CLASS (st_label_parent_class)->dispose (object);