diff options
| author | Yaakov Selkowitz <[email protected]> | 2012-12-20 01:02:15 -0600 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-01-22 14:10:28 +0100 |
| commit | d2c11e9b06b48653e1d0b674eaf8d3230f1ef9bf (patch) | |
| tree | ef284073a1d6a97b3e5ab95ba123bc8e46f39c1a | |
| parent | da45dfd031f7d73a359c526868cb6a22a33b0eae (diff) | |
| download | python-caja-d2c11e9b06b48653e1d0b674eaf8d3230f1ef9bf.tar.bz2 python-caja-d2c11e9b06b48653e1d0b674eaf8d3230f1ef9bf.tar.xz | |
Drop support for old script location
Now is a good time as any, with the extension API changing to g-i.
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | caja-python.pc.in | 2 | ||||
| -rw-r--r-- | src/caja-python.c | 9 |
3 files changed, 2 insertions, 13 deletions
@@ -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 |