Drop ExtensionHelper, move reset method to extension.js

stuarthayhurst · Aug 12, 2023 · 4d0e219 · 4d0e219
1 parent af5fbbd
commit 4d0e219
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -21,7 +21,6 @@ package:
 	--extra-source=../LICENSE.txt \
 	--extra-source=../docs/CHANGELOG.md \
 	--extra-source=ui/gtk4/ \
-	--extra-source=lib/ \
 	-o ../$(BUILD_DIR)/
 check:
 	@if [[ ! -f $(BUNDLE_PATH) ]]; then \

diff --git a/extension/extension.js b/extension/extension.js
@@ -3,7 +3,6 @@
 //Local extension imports
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
-const { ExtensionHelper } = Me.imports.lib;
 
 //Main imports
 const { St, Gio, GObject } = imports.gi;
@@ -68,6 +67,16 @@ const PrivacyIndicator = GObject.registerClass(
       this._locationSettings = new Gio.Settings({schema: 'org.gnome.system.location'});
     }
 
+    _resetSettings() {
+      let privacySettings = new Gio.Settings({schema: 'org.gnome.desktop.privacy'});
+      let locationSettings = new Gio.Settings({schema: 'org.gnome.system.location'});
+
+      //Reset the settings
+      locationSettings.reset('enabled');
+      privacySettings.reset('disable-camera');
+      privacySettings.reset('disable-microphone');
+    }
+
     addEntries() {
       this.menu.addMenuItem(new PopupMenu.PopupMenuItem(
         _('Privacy Settings'),
@@ -107,7 +116,7 @@ const PrivacyIndicator = GObject.registerClass(
       //Create a submenu for the reset option, to prevent a misclick
       let subMenu = new PopupMenu.PopupSubMenuMenuItem(_('Reset settings'), true);
       subMenu.icon.icon_name = 'edit-delete-symbolic';
-      subMenu.menu.addAction(_('Reset to defaults'), ExtensionHelper.resetSettings, null);
+      subMenu.menu.addAction(_('Reset to defaults'), this._resetSettings, null);
 
       this.menu.addMenuItem(subMenu);
     }

diff --git a/extension/lib/ExtensionHelper.js b/extension/lib/ExtensionHelper.js
diff --git a/extension/prefs.js b/extension/prefs.js
@@ -3,7 +3,6 @@
 //Local extension imports
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
-const { ExtensionHelper } = Me.imports.lib;
 const ShellVersion = parseFloat(imports.misc.config.PACKAGE_VERSION);
 
 //Main imports