646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
25 lines
737 B
Diff
25 lines
737 B
Diff
diff --git a/src/nautilus-module.c b/src/nautilus-module.c
|
|
index cd889ff18..e2cd6468e 100644
|
|
--- a/src/nautilus-module.c
|
|
+++ b/src/nautilus-module.c
|
|
@@ -267,6 +267,7 @@ void
|
|
nautilus_module_setup (void)
|
|
{
|
|
static gboolean initialized = FALSE;
|
|
+ const gchar* extensiondir = NULL;
|
|
const gchar *disable_plugins;
|
|
|
|
disable_plugins = g_getenv ("NAUTILUS_DISABLE_PLUGINS");
|
|
@@ -280,7 +281,12 @@ nautilus_module_setup (void)
|
|
{
|
|
initialized = TRUE;
|
|
|
|
- load_module_dir (NAUTILUS_EXTENSIONDIR);
|
|
+ extensiondir = g_getenv ("NAUTILUS_4_EXTENSION_DIR");
|
|
+ if (extensiondir == NULL) {
|
|
+ extensiondir = NAUTILUS_EXTENSIONDIR;
|
|
+ }
|
|
+
|
|
+ load_module_dir (extensiondir);
|
|
}
|