remove deprecated convenience.js

maoschanz · Nov 20, 2021 · c61a0f8 · c61a0f8
1 parent 4139878
commit c61a0f8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 100 deletions.
diff --git a/build-a-zip.sh b/build-a-zip.sh
@@ -14,3 +14,8 @@ zip ../$EXT_ID.zip metadata.json
 zip -r ../$EXT_ID.zip schemas
 zip -r ../$EXT_ID.zip locale
 
+shopt -s globstar
+
+zip -d ../$EXT_ID.zip **/*.pot
+zip -d ../$EXT_ID.zip **/*.po
+
diff --git a/move-osd-windows@maestroschan.fr/convenience.js b/move-osd-windows@maestroschan.fr/convenience.js
diff --git a/move-osd-windows@maestroschan.fr/extension.js b/move-osd-windows@maestroschan.fr/extension.js
@@ -5,10 +5,9 @@ const OsdWindow = imports.ui.osdWindow;
 
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 function init() {
-	Convenience.initTranslations();
+	ExtensionUtils.initTranslations();
 }
 
 //------------------------------------------------------------------------------
@@ -37,7 +36,7 @@ let injections=[];
 //------------------------------------------------------------------------------
 
 function enable() {
-	let settings = Convenience.getSettings('org.gnome.shell.extensions.move-osd-windows');
+	let settings = ExtensionUtils.getSettings();
 
 	injections['show'] = injectToFunction(
 		OsdWindow.OsdWindow.prototype,

diff --git a/move-osd-windows@maestroschan.fr/metadata.json b/move-osd-windows@maestroschan.fr/metadata.json
@@ -10,5 +10,5 @@
   ], 
   "url": "https://github.com/Maestroschan/Move-OSD-Windows-GNOME-Extension", 
   "uuid": "move-osd-windows@maestroschan.fr", 
-  "version": 4
+  "version": 0
 }
diff --git a/move-osd-windows@maestroschan.fr/prefs.js b/move-osd-windows@maestroschan.fr/prefs.js
@@ -8,7 +8,6 @@ const _ = Gettext.gettext;
 
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 //------------------------------------------------------------------------------
 
@@ -24,7 +23,7 @@ const OSDSettingsWidget = new GObject.Class({
 			column_spacing: 20,
 			halign: Gtk.Align.CENTER,
 		});
-		this.SETTINGS = Convenience.getSettings('org.gnome.shell.extensions.move-osd-windows');
+		this.SETTINGS = ExtensionUtils.getSettings();
 
 		//----------------------------------------------------------------------
 
@@ -95,7 +94,7 @@ const OSDSettingsWidget = new GObject.Class({
 //------------------------------------------------------------------------------
 
 function init() {
-	Convenience.initTranslations();
+	ExtensionUtils.initTranslations();
 }
 
 // This is like the "enable" in extension.js : something called each time the