Merge lp:~compiz-team/compiz-libcompizconfig/compiz-libcompizconfig.fix_874842 into lp:compiz-libcompizconfig

Proposed by Sam Spilsbury on 2011-10-15
Status: Merged
Merged at revision: 426
Proposed branch: lp:~compiz-team/compiz-libcompizconfig/compiz-libcompizconfig.fix_874842
Merge into: lp:compiz-libcompizconfig
Diff against target: 24 lines (+2/-1)
2 files modified
src/CMakeLists.txt (+1/-0)
src/main.c (+1/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz-libcompizconfig/compiz-libcompizconfig.fix_874842
Reviewer Review Type Date Requested Status
Robert Carr (community) 2011-10-15 Approve on 2011-10-26
Review via email: mp+79462@code.launchpad.net

Description of the change

To post a comment you must log in.
Robert Carr (robertcarr) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2010-05-21 02:55:08 +0000
+++ src/CMakeLists.txt 2011-10-15 07:35:26 +0000
@@ -24,6 +24,7 @@
24 -DIMAGEDIR=\\\"${COMPIZ_IMAGEDIR}\\\"24 -DIMAGEDIR=\\\"${COMPIZ_IMAGEDIR}\\\"
25 -DMETADATADIR=\\\"${COMPIZ_METADATADIR}\\\"25 -DMETADATADIR=\\\"${COMPIZ_METADATADIR}\\\"
26 -DSYSCONFDIR=\\\"${COMPIZ_SYSCONFDIR}\\\"26 -DSYSCONFDIR=\\\"${COMPIZ_SYSCONFDIR}\\\"
27 -DDATADIR=\\\"${COMPIZ_DATADIR}\\\"
27 -DLIBDIR=\\\"${COMPIZ_LIBDIR}\\\"28 -DLIBDIR=\\\"${COMPIZ_LIBDIR}\\\"
28)29)
2930
3031
=== modified file 'src/main.c'
--- src/main.c 2011-09-15 13:12:45 +0000
+++ src/main.c 2011-10-15 07:35:26 +0000
@@ -3427,7 +3427,7 @@
3427{3427{
3428 struct dirent **nameList;3428 struct dirent **nameList;
3429 int nFile, i;3429 int nFile, i;
3430 char *path = SYSCONFDIR "/compizconfig/upgrades/";3430 char *path = DATADIR "/compizconfig/upgrades/";
3431 char *dupath = NULL;3431 char *dupath = NULL;
3432 FILE *completedUpgrades;3432 FILE *completedUpgrades;
3433 char *cuBuffer;3433 char *cuBuffer;

Subscribers

People subscribed via source and target branches

to all changes: