summaryrefslogtreecommitdiff
path: root/src
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 /src
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
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/screen.cpp4
2 files changed, 5 insertions, 5 deletions
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,