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

bluetooth: Show the Bluetooth switch in more cases

Browse Source 
In older versions of GNOME, when a menu was used for Bluetooth devices,
we tried to avoid showing the Bluetooth menu to folks who didn't use
Bluetooth.

This kept causing problems as the menu would disappear if no
devices were setup and the platform "airplane mode" removed the
Bluetooth device from the USB bus, making it impossible to detect
whether a Bluetooth device existed, compared to a user unplugging a
removable Bluetooth device.

Closes: #5749
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2488>
This commit is contained in:
Bastien Nocera 2022-09-15 18:03:22 +02:00 committed by Marge Bot
parent 13c9fd2a66
commit 57aa91e2b3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,10 @@ const BtClient = GObject.registerClass({
g_interface_info: rfkillManagerInfo, g_interface_info: rfkillManagerInfo,
}); });
this._proxy.connect('g-properties-changed', (p, properties) => { this._proxy.connect('g-properties-changed', (p, properties) => {
if ('BluetoothHardwareAirplaneMode' in properties.unpack()) const changedProperties = properties.unpack();
if ('BluetoothHardwareAirplaneMode' in changedProperties)
this.notify('available');
else if ('BluetoothHasAirplaneMode' in changedProperties)
this.notify('available'); this.notify('available');
}); });
this._proxy.init_async(GLib.PRIORITY_DEFAULT, null) this._proxy.init_async(GLib.PRIORITY_DEFAULT, null)
@ -79,21 +82,19 @@ const BtClient = GObject.registerClass({
this._connectDeviceNotify(deviceStore.get_item(i)); this._connectDeviceNotify(deviceStore.get_item(i));
this._client.connect('device-removed', (c, path) => { this._client.connect('device-removed', (c, path) => {
this._syncHadSetupDevices();
this._deviceNotifyConnected.delete(path); this._deviceNotifyConnected.delete(path);
this.emit('devices-changed'); this.emit('devices-changed');
}); });
this._client.connect('device-added', (c, device) => { this._client.connect('device-added', (c, device) => {
this._syncHadSetupDevices();
this._connectDeviceNotify(device); this._connectDeviceNotify(device);
this.emit('devices-changed'); this.emit('devices-changed');
}); });
} }
get available() { get available() {
// If there were set up devices, assume there is an adapter // If we have an rfkill switch, make sure it's not a hardware
// that can be powered on as long as we're not hard blocked // one as we can't get out of it in software
return this._hadSetupDevices return this._proxy.BluetoothHasAirplaneMode
? !this._proxy.BluetoothHardwareAirplaneMode ? !this._proxy.BluetoothHardwareAirplaneMode
: this.active; : this.active;
} }