summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2010-07-04 10:20:54 +0800
committerSam Spilsbury <smspillaz@gmail.com>2010-07-04 10:34:25 +0800
commit3679efb8307eb39a325d1c701a1dcfeb36a14d7c (patch)
treecad7aab08c9ed235e8113ad7c09dd7e042be0c72
parent1aa9c08cf85ca0658b26859241683bd419ffa50e (diff)
downloadzcomp-3679efb8307eb39a325d1c701a1dcfeb36a14d7c.tar.gz
zcomp-3679efb8307eb39a325d1c701a1dcfeb36a14d7c.tar.bz2
Install and load local information from XDG_HOME/.compiz-1 to prevent conflicts with compiz-0.8
-rw-r--r--cmake/CompizPlugin.cmake10
-rw-r--r--include/core/plugin.h2
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/screen.cpp4
4 files changed, 11 insertions, 11 deletions
diff --git a/cmake/CompizPlugin.cmake b/cmake/CompizPlugin.cmake
index 3e1a60f..60551d6 100644
--- a/cmake/CompizPlugin.cmake
+++ b/cmake/CompizPlugin.cmake
@@ -117,11 +117,11 @@ macro (_prepare_directories)
else ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "compiz" OR
"$ENV{BUILD_GLOBAL}" STREQUAL "true")
set (PLUGIN_BUILDTYPE local)
- set (PLUGIN_PREFIX $ENV{HOME}/.compiz)
- set (PLUGIN_LIBDIR $ENV{HOME}/.compiz/plugins)
- set (PLUGIN_XMLDIR $ENV{HOME}/.compiz/metadata)
- set (PLUGIN_IMAGEDIR $ENV{HOME}/.compiz)
- set (PLUGIN_DATADIR $ENV{HOME}/.compiz)
+ set (PLUGIN_PREFIX $ENV{HOME}/.compiz-1)
+ set (PLUGIN_LIBDIR $ENV{HOME}/.compiz-1/plugins)
+ set (PLUGIN_XMLDIR $ENV{HOME}/.compiz-1/metadata)
+ set (PLUGIN_IMAGEDIR $ENV{HOME}/.compiz-1)
+ set (PLUGIN_DATADIR $ENV{HOME}/.compiz-1)
if (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
set (PLUGIN_SCHEMADIR "$ENV{HOME}/.gconf/schemas")
diff --git a/include/core/plugin.h b/include/core/plugin.h
index 3fc3da5..510f169 100644
--- a/include/core/plugin.h
+++ b/include/core/plugin.h
@@ -34,7 +34,7 @@ extern CompScreen *screen;
#include <map>
-#define HOME_PLUGINDIR ".compiz/plugins"
+#define HOME_PLUGINDIR ".compiz-1/plugins"
#define COMPIZ_PLUGIN_20090315(name, classname) \
CompPlugin::VTable * name##VTable = NULL; \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 17cad68..e54af4e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories (
${COMPIZ_LINK_DIRS}
)
-add_executable (compiz
+add_executable (compiz_aaa
region.cpp
atoms.cpp
timer.cpp
@@ -53,10 +53,10 @@ add_executable (compiz
)
target_link_libraries (
- compiz ${COMPIZ_LIBRARIES} m pthread dl
+ compiz_aaa ${COMPIZ_LIBRARIES} m pthread dl
)
install (
- TARGETS compiz
+ TARGETS compiz_aaa
DESTINATION ${COMPIZ_DESTDIR}${exec_prefix}
)
diff --git a/src/screen.cpp b/src/screen.cpp
index d1cc40f..86ca65a 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -1005,7 +1005,7 @@ PrivateScreen::handleSelectionClear (XEvent *event)
shutDown = true;
}
-#define HOME_IMAGEDIR ".compiz/images"
+#define HOME_IMAGEDIR ".compiz-1/images"
bool
CompScreen::readImageFromFile (CompString &name,
@@ -4218,7 +4218,7 @@ CompScreen::init (const char *name)
attr.override_redirect = true;
attr.event_mask = PropertyChangeMask;
-
+#define PACKAGE "compiz_aaaaaaaaaaaaaaaaa"
newWmSnOwner =
XCreateWindow (dpy, root, -100, -100, 1, 1, 0,
CopyFromParent, CopyFromParent,