From 8f07f164fedd0ca251994653a04b1cfa8e77b3d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Mon, 28 Sep 2026 09:12:32 -0700 Subject: [PATCH] Revert "PlugsManager: load local plugins (#398)" This reverts commit 5641b811c33e772f4a8b24980c2ce93687c12067. --- lib/PlugsManager.vala | 19 ++----------------- lib/config.vapi | 1 - lib/meson.build | 1 - 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/lib/PlugsManager.vala b/lib/PlugsManager.vala index d19be705..4ca6e71c 100644 --- a/lib/PlugsManager.vala +++ b/lib/PlugsManager.vala @@ -36,23 +36,8 @@ public class Switchboard.PlugsManager : GLib.Object { private PlugsManager () { plugs = new Gee.LinkedList (); - - string[] prefixes = { - "/usr", - "/usr/local" - }; - string[] plugin_paths = {}; - foreach (unowned string prefix in prefixes) { - var plugin_dir = Path.build_filename (prefix, Build.LIB_DIR, "switchboard-3") + "/"; - if (FileUtils.test (plugin_dir, FileTest.EXISTS)) { - debug ("Found plugin directory: %s", plugin_dir); - plugin_paths += plugin_dir ; - } - } - - foreach (unowned string path in plugin_paths) { - find_plugins (File.new_for_path (path)); - } + var base_folder = File.new_for_path (Build.PLUGS_DIR); + find_plugins (base_folder); } private void load (string path) { diff --git a/lib/config.vapi b/lib/config.vapi index 2613d9f6..cdbd47e4 100644 --- a/lib/config.vapi +++ b/lib/config.vapi @@ -1,5 +1,4 @@ [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")] namespace Build { public const string PLUGS_DIR; - public const string LIB_DIR; } diff --git a/lib/meson.build b/lib/meson.build index 5f1454b8..5f5f733e 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -2,7 +2,6 @@ config_vapi = meson.get_compiler('vala').find_library('config', dirs: meson.curr config_data = configuration_data() config_data.set_quoted('PLUGS_DIR', plugs_dir) -config_data.set_quoted('LIB_DIR', get_option('libdir')) config_header = configure_file( configuration: config_data,