ac70cd728c
All code that was at xfce4-14 has been moved to xfce/*. Old expressions that aren't rewritten might be abandoned or broken. Additonally I've ported the xfce4-14 thunar expression to support thunarPlugins. We can now support this interface in the Xfce module again, although I'm not sure if we have any plugins packaged that support latest thunar.
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c
|
|
index 94b11545..1f66c982 100644
|
|
--- a/thunarx/thunarx-provider-factory.c
|
|
+++ b/thunarx/thunarx-provider-factory.c
|
|
@@ -150,12 +150,19 @@ static GList*
|
|
thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory)
|
|
{
|
|
ThunarxProviderModule *module;
|
|
+ const gchar *thunar_dir;
|
|
const gchar *name;
|
|
GList *modules = NULL;
|
|
GList *lp;
|
|
GDir *dp;
|
|
|
|
- dp = g_dir_open (THUNARX_DIRECTORY, 0, NULL);
|
|
+ thunar_dir = g_getenv("THUNARX_MODULE_DIR");
|
|
+ if (NULL == thunar_dir)
|
|
+ {
|
|
+ thunar_dir = THUNARX_DIRECTORY;
|
|
+ }
|
|
+
|
|
+ dp = g_dir_open (thunar_dir, 0, NULL);
|
|
if (G_LIKELY (dp != NULL))
|
|
{
|
|
/* determine the types for all existing plugins */
|
|
diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c
|
|
index 023ad2ae..b1d1be8f 100644
|
|
--- a/thunarx/thunarx-provider-module.c
|
|
+++ b/thunarx/thunarx-provider-module.c
|
|
@@ -174,10 +174,17 @@ static gboolean
|
|
thunarx_provider_module_load (GTypeModule *type_module)
|
|
{
|
|
ThunarxProviderModule *module = THUNARX_PROVIDER_MODULE (type_module);
|
|
+ const gchar *thunar_dir;
|
|
gchar *path;
|
|
|
|
+ thunar_dir = g_getenv("THUNARX_MODULE_DIR");
|
|
+ if (NULL == thunar_dir)
|
|
+ {
|
|
+ thunar_dir = THUNARX_DIRECTORY;
|
|
+ }
|
|
+
|
|
/* load the module using the runtime link editor */
|
|
- path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL);
|
|
+ path = g_build_filename (thunar_dir, type_module->name, NULL);
|
|
module->library = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
|
|
g_free (path);
|
|
|