From 63515a3d8d82dec4bfd80d5c2e6f6de8cf77209c Mon Sep 17 00:00:00 2001
From: Simon Schneegans <code@simonschneegans.de>
Date: Mon, 10 Jan 2022 05:53:09 +0100
Subject: [PATCH] :recycle: Introduce utils.getGTKString()

---
 prefs.js          | 12 ++++--------
 src/FireEffect.js |  3 +--
 src/TVEffect.js   |  3 +--
 src/utils.js      |  4 ++++
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/prefs.js b/prefs.js
index 44a201e..8a1eebe 100644
--- a/prefs.js
+++ b/prefs.js
@@ -45,14 +45,10 @@ var PreferencesDialog = class PreferencesDialog {
     this._settings = ExtensionUtils.getSettings();
 
     // Load the general user interface files.
-    {
-      const dir = utils.isGTK4() ? 'gtk4' : 'gtk3';
-
-      this._builder = new Gtk.Builder();
-      this._builder.add_from_resource(`/ui/common/main-menu.ui`);
-      this._builder.add_from_resource(`/ui/${dir}/prefs.ui`);
-      this._builder.add_from_resource(`/ui/${dir}/generalPage.ui`);
-    }
+    this._builder = new Gtk.Builder();
+    this._builder.add_from_resource(`/ui/common/main-menu.ui`);
+    this._builder.add_from_resource(`/ui/${utils.getGTKString()}/prefs.ui`);
+    this._builder.add_from_resource(`/ui/${utils.getGTKString()}/generalPage.ui`);
 
     // Bind general options properties.
     this.bindSwitch('destroy-dialogs');
diff --git a/src/FireEffect.js b/src/FireEffect.js
index d81dedc..01b676c 100644
--- a/src/FireEffect.js
+++ b/src/FireEffect.js
@@ -61,8 +61,7 @@ var FireEffect = class FireEffect {
   static initPreferences(dialog) {
 
     // Add the settings page to the builder.
-    dialog.getBuilder().add_from_resource(
-        `/ui/${utils.isGTK4() ? 'gtk4' : 'gtk3'}/firePage.ui`);
+    dialog.getBuilder().add_from_resource(`/ui/${utils.getGTKString()}/firePage.ui`);
 
     // Bind all properties.
     dialog.bindAdjustment('fire-animation-time');
diff --git a/src/TVEffect.js b/src/TVEffect.js
index 4d84319..f44faec 100644
--- a/src/TVEffect.js
+++ b/src/TVEffect.js
@@ -59,8 +59,7 @@ var TVEffect = class TVEffect {
   static initPreferences(dialog) {
 
     // Add the settings page to the builder.
-    dialog.getBuilder().add_from_resource(
-        `/ui/${utils.isGTK4() ? 'gtk4' : 'gtk3'}/tvPage.ui`);
+    dialog.getBuilder().add_from_resource(`/ui/${utils.getGTKString()}/tvPage.ui`);
 
     // Bind all properties.
     dialog.bindAdjustment('tv-animation-time');
diff --git a/src/utils.js b/src/utils.js
index ffcb71b..11ef4f5 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -46,6 +46,10 @@ function isGTK4() {
   return Gtk.get_major_version() == 4;
 }
 
+function getGTKString() {
+  return isGTK4() ? 'gtk4' : 'gtk3';
+}
+
 function isInShellProcess() {
   return window.global && global.stage;
 }