summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README4
-rw-r--r--caja-python.pc.in2
-rw-r--r--src/caja-python.c9
3 files changed, 2 insertions, 13 deletions
diff --git a/README b/README
index 4ec07b4..1511a38 100644
--- a/README
+++ b/README
@@ -5,9 +5,7 @@ These are unstable bindings for the caja extension library.
For examples and documentation check the examples sub directory.
-Note that scripts are loaded from $prefix/lib/caja/extensions-2.0/python.
-
-Scripts are also loaded from $XDG_DATA_DIR/caja-python/extensions,
+As of python-caja 1.5.0, scripts are loaded only from $XDG_DATA_DIR/caja-python/extensions,
which includes ~/.local/share and /usr/share (or whatever your $XDG_DATA_DIR is
set to).
diff --git a/caja-python.pc.in b/caja-python.pc.in
index 145cf89..574674c 100644
--- a/caja-python.pc.in
+++ b/caja-python.pc.in
@@ -4,4 +4,4 @@ Version: @VERSION@
prefix=@prefix@
libdir=${prefix}/lib
-pythondir=@CAJA_EXTENSION_DIR@/python
+pythondir=@datadir@/caja-python/extensions
diff --git a/src/caja-python.c b/src/caja-python.c
index 3826c1e..a6a7478 100644
--- a/src/caja-python.c
+++ b/src/caja-python.c
@@ -260,15 +260,6 @@ caja_module_initialize(GTypeModule *module)
user_extensions_dir = g_build_filename(g_get_user_data_dir(),
"caja-python", "extensions", NULL);
caja_python_load_dir(module, user_extensions_dir);
-
- // Look in the old local path, ~/.caja/python-extensions
- user_extensions_dir = g_build_filename(g_get_home_dir(),
- ".caja", "python-extensions", NULL);
- caja_python_load_dir(module, user_extensions_dir);
- g_free(user_extensions_dir);
-
- // Look in the old global path, /usr/lib(64)/caja/extensions-2.0/python
- caja_python_load_dir(module, CAJA_EXTENSION_DIR "/python");
}
void