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

bluetooth: Remove unused 'had-bluetooth-devices-setup' setting

Browse Source 
Now that we always show the Bluetooth switch when there's a Bluetooth
adapter hiding somewhere, remove all the settings it used as storage.

If the user wants to really really disable any Bluetooth adapters in
their system, the gnome-bluetooth documentation explains how to do that
irrespective of GNOME:
https://gitlab.gnome.org/GNOME/gnome-bluetooth/#multiple-bluetooth-adapters

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2488>
This commit is contained in:
Bastien Nocera
2022-09-15 18:05:58 +02:00
committed by Marge Bot
parent 57aa91e2b3
commit e7cf6d348c
2 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,8 +15,6 @@ const OBJECT_PATH = '/org/gnome/SettingsDaemon/Rfkill';
const RfkillManagerInterface = loadInterfaceXML('org.gnome.SettingsDaemon.Rfkill');
const rfkillManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(RfkillManagerInterface);
const HAD_BLUETOOTH_DEVICES_SETUP = 'had-bluetooth-devices-setup';
const BtClient = GObject.registerClass({
Properties: {
'available': GObject.ParamSpec.boolean('available', '', '',
@ -36,8 +34,6 @@ const BtClient = GObject.registerClass({
_init() {
super._init();
this._hadSetupDevices = global.settings.get_boolean(HAD_BLUETOOTH_DEVICES_SETUP);
this._client = new GnomeBluetooth.Client();
this._client.connect('notify::default-adapter-powered', () => {
this.notify('active');
@ -128,29 +124,12 @@ const BtClient = GObject.registerClass({
if (this._devicesChangedId)
return;
this._devicesChangedId = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
this._syncHadSetupDevices();
delete this._devicesChangedId;
this.emit('devices-changed');
return GLib.SOURCE_REMOVE;
});
}
_syncHadSetupDevices() {
const {defaultAdapter} = this._client;
if (!defaultAdapter || !this._adapter)
return; // ignore changes while powering up/down
const [firstDevice] = this.getDevices();
const hadSetupDevices = !!firstDevice;
if (this._hadSetupDevices === hadSetupDevices)
return;
this._hadSetupDevices = hadSetupDevices;
global.settings.set_boolean(
HAD_BLUETOOTH_DEVICES_SETUP, this._hadSetupDevices);
}
_connectDeviceNotify(device) {
const path = device.get_object_path();