brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BluetoothStatus: hide the icon when no adapter is present

Browse Source 
There is no point in showing the bluetooth status, when the required
hardware is missing. Just hide in that case.

https://bugzilla.gnome.org/show_bug.cgi?id=638306
This commit is contained in:
Giovanni Campagna 2010-12-30 15:34:42 +01:00
parent 4de15b2b57
commit b2bb0bf10f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/ui/status/bluetooth.js
View File

@ -104,12 +104,18 @@ Indicator.prototype = {
_updateKillswitch: function() { _updateKillswitch: function() {
let current_state = this._applet.killswitch_state; let current_state = this._applet.killswitch_state;
let on = current_state == GnomeBluetoothApplet.KillswitchState.UNBLOCKED; 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 && let can_toggle = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER &&
current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED; current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED;
this._killswitch.setToggleState(on); this._killswitch.setToggleState(on);
this._killswitch.actor.reactive = can_toggle; this._killswitch.actor.reactive = can_toggle;
if (has_adapter)
this.actor.show();
else
this.actor.hide();
if (on) { if (on) {
this._discoverable.actor.show(); this._discoverable.actor.show();
this.setIcon('bluetooth-active'); this.setIcon('bluetooth-active');
@ -130,7 +136,7 @@ Indicator.prototype = {
let devices = this._applet.get_devices(); let devices = this._applet.get_devices();
for (let i = 0; i < this._deviceItems.length; i++) { for (let i = 0; i < this._deviceItems.length; i++) {
let item = this._deviceItems.length; let item = this._deviceItems[i];
let destroy = true; let destroy = true;
for (let j = 0; j < devices.length; j++) { for (let j = 0; j < devices.length; j++) {
// we need to deep compare because BluetoothSimpleDevice is a boxed type // we need to deep compare because BluetoothSimpleDevice is a boxed type