[gnome-shell/wip/hadess/simplify-showing-bt-switch: 2/2] bluetooth: Remove unused 'had-bluetooth-devices-setup' setting
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/hadess/simplify-showing-bt-switch: 2/2] bluetooth: Remove unused 'had-bluetooth-devices-setup' setting
- Date: Thu, 15 Sep 2022 19:36:43 +0000 (UTC)
commit 221a58e8bce27948895a9f50b304aedda42d265e
Author: Bastien Nocera <hadess hadess net>
Date: Thu Sep 15 18:05:58 2022 +0200
bluetooth: Remove unused 'had-bluetooth-devices-setup' setting
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
data/org.gnome.shell.gschema.xml.in | 10 ----------
js/ui/status/bluetooth.js | 21 ---------------------
2 files changed, 31 deletions(-)
---
diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
index c56a3399eb..86ad1b24b5 100644
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@@ -84,16 +84,6 @@
This key sets the default state of the checkbox.
</description>
</key>
- <key name="had-bluetooth-devices-setup" type="b">
- <default>false</default>
- <summary>Whether the default Bluetooth adapter had set up devices associated to it</summary>
- <description>
- The shell will only show a Bluetooth menu item if a Bluetooth
- adapter is powered, or if there were devices set up associated
- with the default adapter. This will be reset if the default
- adapter is ever seen not to have devices associated to it.
- </description>
- </key>
<key name="last-selected-power-profile" type="s">
<default>"power-saver"</default>
<summary>The last selected non-default power profile</summary>
diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index f5ed1775b1..bbff62da7f 100644
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -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();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]