Bug#712904: cinnamon: needs to be updated for gnome-bluetooth api change

[Emilio Pozuelo Monfort]

Package: cinnamon
Version: 1.7.4-2

gnome-bluetooth slightly changed the API. cinnamon needs to be updated for this
change. The attached patch fixed gnome-shell 3.4 and since cinnamon seems to
have a copy of this code it should probably work too (or server as a guide).

Could you upload something like this ASAP? The gnome-bluetooth transition is
going to block the apache transition so we need to get this fixed quickly.

If you are too busy I can do an NMU.

Thanks,
Emilio

--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -4,6 +4,7 @@
 const Gdk = imports.gi.Gdk;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
+const GnomeBluetooth = imports.gi.GnomeBluetooth;
 const GnomeBluetoothApplet = imports.gi.GnomeBluetoothApplet;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
@@ -36,11 +37,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 != GnomeBluetooth.KillswitchState.HARD_BLOCKED &&
+                current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER) {
                 this._applet.killswitch_state = this._killswitch.state ?
-                    GnomeBluetoothApplet.KillswitchState.UNBLOCKED:
-                    GnomeBluetoothApplet.KillswitchState.SOFT_BLOCKED;
+                    GnomeBluetooth.KillswitchState.UNBLOCKED:
+                    GnomeBluetooth.KillswitchState.SOFT_BLOCKED;
             } else
                 this._killswitch.setToggleState(false);
         }));
@@ -94,10 +95,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 == GnomeBluetooth.KillswitchState.UNBLOCKED;
+        let has_adapter = current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER;
+        let can_toggle = current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER &&
+                         current_state != GnomeBluetooth.KillswitchState.HARD_BLOCKED;
 
         this._killswitch.setToggleState(on);
         if (can_toggle)