Utils: Remove getSchema function

src/modules/SwitcherCommands.js

@@ -7,7 +7,6 @@ const { extensionUtils } = imports.misc;
 const Me = extensionUtils.getCurrentExtension();
 
 const debug = Me.imports.debug;
-const utils = Me.imports.utils;
 
 const { Switcher } = Me.imports.modules.Switcher;
 
@@ -24,7 +23,7 @@ var SwitcherCommands = class extends Switcher {
     #settings;
 
     constructor({ timer }) {
-        const settings = extensionUtils.getSettings(utils.getSettingsSchema('commands'));
+        const settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.commands`);
         super({
             name: 'Command',
             timer,

src/modules/SwitcherTheme.js

@@ -145,7 +145,7 @@ var SwitcherThemeCursor = class extends SwitcherTheme {
         super({
             name: 'Cursor theme',
             timer,
-            settings: extensionUtils.getSettings(utils.getSettingsSchema('cursor-variants')),
+            settings: extensionUtils.getSettings(`${Me.metadata['settings-schema']}.cursor-variants`),
             systemSettings: new Gio.Settings({ schema: 'org.gnome.desktop.interface' }),
             themeKey: 'cursor-theme',
         });
@@ -158,7 +158,7 @@ var SwitcherThemeGtk = class extends SwitcherTheme {
         super({
             name: 'GTK theme',
             timer,
-            settings: extensionUtils.getSettings(utils.getSettingsSchema('gtk-variants')),
+            settings: extensionUtils.getSettings(`${Me.metadata['settings-schema']}.gtk-variants`),
             systemSettings: new Gio.Settings({ schema: 'org.gnome.desktop.interface' }),
             themeKey: 'gtk-theme',
         });
@@ -171,7 +171,7 @@ var SwitcherThemeIcon = class extends SwitcherTheme {
         super({
             name: 'Icon theme',
             timer,
-            settings: extensionUtils.getSettings(utils.getSettingsSchema('icon-variants')),
+            settings: extensionUtils.getSettings(`${Me.metadata['settings-schema']}.icon-variants`),
             systemSettings: new Gio.Settings({ schema: 'org.gnome.desktop.interface' }),
             themeKey: 'icon-theme',
         });
@@ -183,7 +183,7 @@ var SwitcherThemeShell = class extends SwitcherTheme {
     #settings;
 
     constructor({ timer }) {
-        const settings = extensionUtils.getSettings(utils.getSettingsSchema('shell-variants'));
+        const settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.shell-variants`);
         super({
             name: 'Shell theme',
             timer,

src/modules/Timer.js

@@ -10,7 +10,6 @@ const { main } = imports.ui;
 const Me = extensionUtils.getCurrentExtension();
 
 const debug = Me.imports.debug;
-const utils = Me.imports.utils;
 
 const { Time } = Me.imports.enums.Time;
 const { TimerNightlight } = Me.imports.modules.TimerNightlight;
@@ -46,7 +45,7 @@ var Timer = class {
     #timeConnections = [];
 
     constructor() {
-        this.#settings = extensionUtils.getSettings(utils.getSettingsSchema('time'));
+        this.#settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`);
         this.#interfaceSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
         this.#colorSettings = new Gio.Settings({ schema: 'org.gnome.settings-daemon.plugins.color' });
         this.#locationSettings = new Gio.Settings({ schema: 'org.gnome.system.location' });

src/modules/TimerLocation.js

@@ -8,7 +8,6 @@ const Signals = imports.signals;
 const Me = extensionUtils.getCurrentExtension();
 
 const debug = Me.imports.debug;
-const utils = Me.imports.utils;
 
 const { Time } = Me.imports.enums.Time;
 
@@ -39,7 +38,7 @@ var TimerLocation = class {
     constructor() {
         // Before we have the location suntimes, we'll use the manual schedule
         // times
-        const timeSettings = extensionUtils.getSettings(utils.getSettingsSchema('time'));
+        const timeSettings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`);
         this.#suntimes = new Map([
             ['sunrise', timeSettings.get_double('schedule-sunrise')],
             ['sunset', timeSettings.get_double('schedule-sunset')],

src/modules/TimerNightlight.js

@@ -8,7 +8,6 @@ const Signals = imports.signals;
 const Me = extensionUtils.getCurrentExtension();
 
 const debug = Me.imports.debug;
-const utils = Me.imports.utils;
 
 const { Time } = Me.imports.enums.Time;
 
@@ -38,7 +37,7 @@ var TimerNightlight = class {
     #previousNightlightState = null;
 
     constructor() {
-        this.#settings = extensionUtils.getSettings(utils.getSettingsSchema('time'));
+        this.#settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`);
     }
 
     async enable() {

src/modules/TimerOndemand.js

@@ -35,7 +35,7 @@ var TimerOndemand = class {
 
     constructor({ timer }) {
         this.#timer = timer;
-        this.#settings = extensionUtils.getSettings(utils.getSettingsSchema('time'));
+        this.#settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`);
     }
 
     enable() {

src/modules/TimerSchedule.js

@@ -8,7 +8,6 @@ const Signals = imports.signals;
 const Me = extensionUtils.getCurrentExtension();
 
 const debug = Me.imports.debug;
-const utils = Me.imports.utils;
 
 const { Time } = Me.imports.enums.Time;
 
@@ -28,7 +27,7 @@ var TimerSchedule = class {
     #timeChangeTimer = null;
 
     constructor() {
-        this.#settings = extensionUtils.getSettings(utils.getSettingsSchema('time'));
+        this.#settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`);
     }
 
     enable() {

src/preferences/CommandsPage.js

@@ -6,8 +6,6 @@ const { extensionUtils } = imports.misc;
 
 const Me = extensionUtils.getCurrentExtension();
 
-const utils = Me.imports.utils;
-
 
 var CommandsPage = GObject.registerClass({
     GTypeName: 'CommandsPage',
@@ -20,7 +18,7 @@ var CommandsPage = GObject.registerClass({
 }, class CommandsPage extends Adw.PreferencesPage {
     constructor(props = {}) {
         super(props);
-        const settings = extensionUtils.getSettings(utils.getSettingsSchema('commands'));
+        const settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.commands`);
 
         settings.bind('enabled', this._enabled_switch, 'active', Gio.SettingsBindFlags.DEFAULT);
         settings.bind('sunrise', this._sunrise_entry, 'text', Gio.SettingsBindFlags.DEFAULT);

src/preferences/SchedulePage.js

@@ -30,7 +30,7 @@ var SchedulePage = GObject.registerClass({
 }, class SchedulePage extends Adw.PreferencesPage {
     constructor(props = {}) {
         super(props);
-        const settings = extensionUtils.getSettings(utils.getSettingsSchema('time'));
+        const settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`);
         const colorSettings = new Gio.Settings({ schema: 'org.gnome.settings-daemon.plugins.color' });
         const locationSettings = new Gio.Settings({ schema: 'org.gnome.system.location' });
 

src/preferences/ThemesPage.js

@@ -32,10 +32,10 @@ var ThemesPage = GObject.registerClass({
 }, class ThemesPage extends Adw.PreferencesPage {
     constructor(props = {}) {
         super(props);
-        const gtkSettings = extensionUtils.getSettings(utils.getSettingsSchema('gtk-variants'));
+        const gtkSettings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.gtk-variants`);
-        const shellSettings = extensionUtils.getSettings(utils.getSettingsSchema('shell-variants'));
+        const shellSettings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.shell-variants`);
-        const iconSettings = extensionUtils.getSettings(utils.getSettingsSchema('icon-variants'));
+        const iconSettings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.icon-variants`);
-        const cursorSettings = extensionUtils.getSettings(utils.getSettingsSchema('cursor-variants'));
+        const cursorSettings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.cursor-variants`);
 
         gtkSettings.bind('enabled', this._gtk_row, 'enable-expansion', Gio.SettingsBindFlags.DEFAULT);
 

src/utils.js

@@ -12,16 +12,6 @@ const _ = Gettext.gettext;
 const { ExtensionState } = extensionUtils;
 
 
-/**
- * Build the full settings schema from a subschema.
- *
- * @param {string} subSchema The subschema to get.
- * @returns {string} The full schema.
- */
-function getSettingsSchema(subSchema) {
-    return subSchema ? `${Me.metadata['settings-schema']}.${subSchema}` : Me.metadata['settings-schema'];
-}
-
 /**
  * Get all the directories of the system for a resource.
  *