diff --git a/src/config.js b/src/config.js deleted file mode 100644 index a77dadb..0000000 --- a/src/config.js +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-FileCopyrightText: 2020, 2021 Romain Vigier -// SPDX-License-Identifier: GPL-3.0-or-later - -var debug = false; diff --git a/src/modules/GtkThemer.js b/src/modules/GtkThemer.js index 6b8ff32..b10b73a 100644 --- a/src/modules/GtkThemer.js +++ b/src/modules/GtkThemer.js @@ -9,7 +9,6 @@ const Me = extensionUtils.getCurrentExtension(); const e = Me.imports.extension; const utils = Me.imports.utils; -const { notifyError } = utils; const { GtkVariants } = Me.imports.modules.GtkVariants; const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); @@ -47,7 +46,7 @@ var GtkThemer = class { this._updateSystemGtkTheme(); } } catch (error) { - notifyError(error); + main.notifyError(Me.metadata.name, error); } console.debug('GTK Themer enabled.'); } @@ -137,7 +136,7 @@ var GtkThemer = class { this._updateCurrentVariant(); this._updateSystemGtkTheme(); } catch (error) { - notifyError(error); + main.notifyError(Me.metadata.name, error); } } diff --git a/src/modules/ShellThemer.js b/src/modules/ShellThemer.js index 4c3778c..20b802d 100644 --- a/src/modules/ShellThemer.js +++ b/src/modules/ShellThemer.js @@ -3,14 +3,12 @@ const { Gio } = imports.gi; const { extensionUtils } = imports.misc; -const Signals = imports.signals; const { main } = imports.ui; const Me = extensionUtils.getCurrentExtension(); const e = Me.imports.extension; const utils = Me.imports.utils; -const { notifyError } = Me.imports.utils; const { ShellVariants } = Me.imports.modules.ShellVariants; const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); @@ -47,7 +45,7 @@ var ShellThemer = class { this._updateSystemShellTheme(); } } catch (error) { - notifyError(error); + main.notifyError(Me.metadata.name, error); } console.debug('Shell Themer enabled.'); } @@ -141,7 +139,7 @@ var ShellThemer = class { this._updateCurrentVariant(); this._updateSystemShellTheme(); } catch (error) { - notifyError(error); + main.notifyError(Me.metadata.name, error); } } diff --git a/src/utils.js b/src/utils.js index bd043f6..8888d1b 100644 --- a/src/utils.js +++ b/src/utils.js @@ -5,24 +5,11 @@ const { Gdk, Gio, GLib, Gtk } = imports.gi; const { extensionUtils } = imports.misc; const Me = extensionUtils.getCurrentExtension(); -const config = Me.imports.config; const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; -/** - * Log an error and show a notification if it has a message. - * - * @param {Error} error The error to log. - */ -function notifyError(error) { - if (config.debug) - logError(error, Me.metadata.name); - if (error.message && imports.ui) - imports.ui.main.notifyError(Me.metadata.name, error.message); -} - /** * Build the full settings schema from a subschema. *