Bug#712861: gnome-bluetooth: Breaks gnome-shell: GnomeBluetoothApplet.KillswitchState is undefined

[Emilio Pozuelo Monfort]

reassign 712861 gnome-shell
severity 712861 serious
thanks

Hi,

On 20/06/13 11:18, Peter De Wachter wrote:
> Package: gnome-bluetooth
> Version: 3.8.1-1
> Severity: important
> 
> Dear Maintainer,
> 
> After installing this version of gnome-bluetooth, gnome-shell 3.4.2-8 refuses
> to start with the following error message:
> 
>     JS ERROR: !!!   Exception was: TypeError: 
> GnomeBluetoothApplet.KillswitchState is undefined
>     JS ERROR: !!!     message = '"GnomeBluetoothApplet.KillswitchState is 
> undefined"'
>     JS ERROR: !!!     fileName = 
> '"/usr/share/gnome-shell/js/ui/status/bluetooth.js"'
>     JS ERROR: !!!     lineNumber = '97'
>     JS ERROR: !!!     stack = 
> '"()@/usr/share/gnome-shell/js/ui/status/bluetooth.js:97
> wrapper()@/usr/share/gjs-1.0/lang.js:204
> ()@/usr/share/gnome-shell/js/ui/status/bluetooth.js:56
> wrapper()@/usr/share/gjs-1.0/lang.js:204
> ()@/usr/share/gjs-1.0/lang.js:145
> ()@/usr/share/gjs-1.0/lang.js:239
> ()@/usr/share/gnome-shell/js/ui/panel.js:1135
> wrapper()@/usr/share/gjs-1.0/lang.js:204
> start()@/usr/share/gnome-shell/js/ui/main.js:234
> @<main>:1

That was my bad. Can you apply the attached patch to
/usr/share/gnome-shell/js/ui/status/bluetooth.js and see if gnome-shell works
fine with it?

Thanks,
Emilio

--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -36,11 +36,11 @@
         this._applet.connect('notify::killswitch-state', Lang.bind(this, this._updateKillswitch));
         this._killswitch.connect('toggled', Lang.bind(this, function() {
             let current_state = this._applet.killswitch_state;
-            if (current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED &&
-                current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER) {
+            if (current_state != GnomeBluetoothApplet.BluetoothKillswitchState.HARD_BLOCKED &&
+                current_state != GnomeBluetoothApplet.BluetoothKillswitchState.NO_ADAPTER) {
                 this._applet.killswitch_state = this._killswitch.state ?
-                    GnomeBluetoothApplet.KillswitchState.UNBLOCKED:
-                    GnomeBluetoothApplet.KillswitchState.SOFT_BLOCKED;
+                    GnomeBluetoothApplet.BluetoothKillswitchState.UNBLOCKED:
+                    GnomeBluetoothApplet.BluetoothKillswitchState.SOFT_BLOCKED;
             } else
                 this._killswitch.setToggleState(false);
         }));
@@ -94,10 +94,10 @@
 
     _updateKillswitch: function() {
         let current_state = this._applet.killswitch_state;
-        let on = current_state == GnomeBluetoothApplet.KillswitchState.UNBLOCKED;
-        let has_adapter = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER;
-        let can_toggle = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER &&
-                         current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED;
+        let on = current_state == GnomeBluetoothApplet.BluetoothKillswitchState.UNBLOCKED;
+        let has_adapter = current_state != GnomeBluetoothApplet.BluetoothKillswitchState.NO_ADAPTER;
+        let can_toggle = current_state != GnomeBluetoothApplet.BluetoothKillswitchState.NO_ADAPTER &&
+                         current_state != GnomeBluetoothApplet.BluetoothKillswitchState.HARD_BLOCKED;
 
         this._killswitch.setToggleState(on);
         if (can_toggle)