40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
|
diff -ru -x '*~' compiz-0.8.6-orig/src/metadata.c compiz-0.8.6/src/metadata.c
|
||
|
|
--- compiz-0.8.6-orig/src/metadata.c 2010-03-28 14:15:35.000000000 +0200
|
||
|
|
+++ compiz-0.8.6/src/metadata.c 2010-10-20 00:22:47.000000000 +0200
|
||
|
|
@@ -146,7 +146,7 @@
|
||
|
|
compAddMetadataFromFile (CompMetadata *metadata,
|
||
|
|
const char *file)
|
||
|
|
{
|
||
|
|
- char *home;
|
||
|
|
+ char *home, *metadatadir;
|
||
|
|
Bool status = FALSE;
|
||
|
|
|
||
|
|
home = getenv ("HOME");
|
||
|
|
@@ -163,7 +163,10 @@
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- status |= addMetadataFromFilename (metadata, METADATADIR, file);
|
||
|
|
+ metadatadir = getenv("COMPIZ_METADATADIR");
|
||
|
|
+ if (!metadatadir) metadatadir = METADATADIR;
|
||
|
|
+
|
||
|
|
+ status |= addMetadataFromFilename (metadata, metadatadir, file);
|
||
|
|
if (!status)
|
||
|
|
{
|
||
|
|
compLogMessage ("core", CompLogLevelWarn,
|
||
|
|
diff -ru -x '*~' compiz-0.8.6-orig/src/plugin.c compiz-0.8.6/src/plugin.c
|
||
|
|
--- compiz-0.8.6-orig/src/plugin.c 2010-03-28 14:15:35.000000000 +0200
|
||
|
|
+++ compiz-0.8.6/src/plugin.c 2010-10-20 00:25:16.000000000 +0200
|
||
|
|
@@ -579,7 +579,10 @@
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- status = (*loaderLoadPlugin) (p, PLUGINDIR, name);
|
||
|
|
+ plugindir = getenv("COMPIZ_PLUGINDIR");
|
||
|
|
+ if (!plugindir) plugindir = PLUGINDIR;
|
||
|
|
+
|
||
|
|
+ status = (*loaderLoadPlugin) (p, plugindir, name);
|
||
|
|
if (status)
|
||
|
|
return p;
|
||
|
|
|