]>
Commit | Line | Data |
---|---|---|
288d9b2c | 1 | diff -urd e16-0.16.8.1/src/config.c e16-0.16.8.1.edirconf/src/config.c |
2 | --- e16-0.16.8.1/src/config.c 2006-03-28 20:06:00.000000000 +0200 | |
3 | +++ e16-0.16.8.1.edirconf/src/config.c 2006-07-17 21:58:47.000000000 +0200 | |
4 | @@ -200,7 +200,7 @@ | |
5 | def_shell = usershell(getuid()); | |
6 | ||
7 | Esnprintf(execline, sizeof(execline), "%s " "-P " "-nostdinc " "-undef " | |
8 | - "-include %s/config/definitions " "-I%s " "-I%s/config " | |
9 | + "-include %s/definitions " "-I%s " "-I%s " | |
10 | "-D ENLIGHTENMENT_VERSION=%s " "-D ENLIGHTENMENT_ROOT=%s " | |
11 | "-D ENLIGHTENMENT_BIN=%s " | |
12 | "-D ENLIGHTENMENT_THEME=%s " "-D ECONFDIR=%s " | |
13 | @@ -209,7 +209,7 @@ | |
14 | "-D SCREEN_DEPTH_%i=1 " "-D USER_NAME=%s " "-D HOME_DIR=%s " | |
15 | "-D USER_SHELL=%s " "-D ENLIGHTENMENT_VERSION_015=1 " | |
16 | "%s %s", | |
17 | - epp_path, EDirRoot(), Mode.theme.path, EDirRoot(), | |
18 | + epp_path, EDirConf(), Mode.theme.path, EDirConf(), | |
19 | ENLIGHTENMENT_VERSION, EDirRoot(), EDirBin(), | |
20 | Mode.theme.path, EDirUser(), EDirUserCache(), VRoot.w, | |
21 | VRoot.h, VRoot.w, VRoot.h, VRoot.depth, def_user, def_home, | |
22 | @@ -450,7 +450,7 @@ | |
23 | } | |
9dc8bff6 | 24 | |
25 | /* look in system config dir */ | |
288d9b2c | 26 | - Esnprintf(s, sizeof(s), "%s/config", EDirRoot()); |
27 | + Esnprintf(s, sizeof(s), "%s", EDirConf()); | |
28 | p = FindFileLocalized(file, s, localized); | |
29 | if (p) | |
30 | return p; | |
31 | diff -urd e16-0.16.8.1/src/E.h e16-0.16.8.1.edirconf/src/E.h | |
32 | --- e16-0.16.8.1/src/E.h 2006-03-28 20:06:01.000000000 +0200 | |
33 | +++ e16-0.16.8.1.edirconf/src/E.h 2006-07-17 21:59:16.000000000 +0200 | |
34 | @@ -825,6 +825,7 @@ | |
35 | ||
36 | /* main.c */ | |
37 | void EExit(int exitcode); | |
9dc8bff6 | 38 | +const char *EDirConf(void); |
39 | const char *EDirRoot(void); | |
40 | const char *EDirBin(void); | |
288d9b2c | 41 | const char *EDirUser(void); |
42 | diff -urd e16-0.16.8.1/src/misc.c e16-0.16.8.1.edirconf/src/misc.c | |
43 | --- e16-0.16.8.1/src/misc.c 2006-03-28 20:06:01.000000000 +0200 | |
44 | +++ e16-0.16.8.1.edirconf/src/misc.c 2006-07-17 21:56:16.000000000 +0200 | |
45 | @@ -147,6 +147,13 @@ | |
46 | return k1 + x * l; | |
9dc8bff6 | 47 | } |
48 | ||
49 | +const char * | |
50 | +EDirConf(void) | |
51 | +{ | |
52 | + return ENLIGHTENMENT_CONF; | |
53 | +} | |
54 | + | |
55 | + | |
56 | void | |
288d9b2c | 57 | ETimedLoopInit(int k1, int k2, int speed) |
9dc8bff6 | 58 | { |