Remove utils.js and use ExtensionUtils instead

RaphaelRochet · Nov 3, 2021 · bc77e32 · bc77e32
1 parent e9e588f
commit bc77e32
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 67 deletions.
diff --git a/extension.js b/extension.js
@@ -5,7 +5,7 @@ const Tweener = imports.tweener.tweener;
 const Gio = imports.gi.Gio
 const Pango = imports.gi.Pango;
 const extension = imports.misc.extensionUtils.getCurrentExtension();
-const Utils = extension.imports.utils;
+const ExtensionUtils = imports.misc.extensionUtils;
 const Format = imports.format;
 const Gettext = imports.gettext.domain('applications-overview-tooltip');
 const _ = Gettext.gettext;
@@ -41,15 +41,15 @@ function init() {
 
 	// Translation init
 	String.prototype.format = Format.format;
-	Utils.initTranslations("applications-overview-tooltip");
+	ExtensionUtils.initTranslations("applications-overview-tooltip");
 
 }
 
 
 function enable() {
 
 	// Settings access
-	_settings = Utils.getSettings();
+	_settings = ExtensionUtils.getSettings('org.gnome.shell.extensions.applications-overview-tooltip');
 	_applySettings();
 	_tooltips = new Array();
 

diff --git a/prefs.js b/prefs.js
@@ -7,17 +7,17 @@ const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const Utils = Me.imports.utils;
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
 
 const Gettext = imports.gettext.domain('applications-overview-tooltip');
 const _ = Gettext.gettext;
 
 let settings;
 
 function init() {
-	settings = Utils.getSettings(Me);
-	Utils.initTranslations("applications-overview-tooltip");
+	settings = ExtensionUtils.getSettings('org.gnome.shell.extensions.applications-overview-tooltip');
+	ExtensionUtils.initTranslations("applications-overview-tooltip");
 }
 
 function buildPrefsWidget(){

diff --git a/utils.js b/utils.js