]>
Commit | Line | Data |
---|---|---|
9b0def63 | 1 | diff -Nur enlightenment-0.16.7.1.orig/src/config.c enlightenment-0.16.7.1/src/config.c |
2 | --- enlightenment-0.16.7.1.orig/src/config.c 2004-08-20 23:35:46.000000000 +0200 | |
3 | +++ enlightenment-0.16.7.1/src/config.c 2004-10-01 01:32:53.715493632 +0200 | |
4 | @@ -3348,7 +3348,7 @@ | |
5 | i++; | |
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 | @@ -3357,7 +3357,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/cached/cfg/%s.preparsed", | |
17 | - epp_path, EDirRoot(), themepath, EDirRoot(), | |
18 | + epp_path, EDirConf(), themepath, EDirConf(), | |
19 | ENLIGHTENMENT_VERSION, EDirRoot(), EDirBin(), | |
20 | themepath, EDirUser(), EDirUserCache(), VRoot.w, VRoot.h, | |
21 | VRoot.w, VRoot.h, VRoot.depth, def_user, def_home, def_shell, | |
22 | @@ -3586,7 +3586,7 @@ | |
23 | EDBUG_RETURN(Estrdup(s)); | |
24 | ||
25 | /* look in system config dir */ | |
26 | - Esnprintf(s, sizeof(s), "%s/config/%s", EDirRoot(), file); | |
27 | + Esnprintf(s, sizeof(s), "%s/%s", EDirConf(), file); | |
28 | if (findLocalizedFile(s) || isfile(s)) | |
29 | EDBUG_RETURN(Estrdup(s)); | |
30 | ||
31 | @@ -3615,7 +3615,7 @@ | |
32 | EDBUG_RETURN(Estrdup(s)); | |
33 | ||
34 | /* look in system config dir */ | |
35 | - Esnprintf(s, sizeof(s), "%s/config/%s", EDirRoot(), file); | |
36 | + Esnprintf(s, sizeof(s), "%s/%s", EDirConf(), file); | |
37 | if (findLocalizedFile(s) || isfile(s)) | |
38 | EDBUG_RETURN(Estrdup(s)); | |
39 | ||
40 | @@ -3692,7 +3692,7 @@ | |
41 | EDBUG(5, "LoadEConfig"); | |
42 | ||
43 | Esnprintf(s, sizeof(s), "%s/", EDirUser()); | |
44 | - Esnprintf(s, sizeof(s), "%s/config/", EDirRoot()); | |
45 | + Esnprintf(s, sizeof(s), "%s/", EDirConf()); | |
46 | ||
47 | /* save the current theme */ | |
48 | if ((themelocation) && (themelocation[0] != 0)) | |
49 | diff -Nur enlightenment-0.16.7.1.orig/src/E.h enlightenment-0.16.7.1/src/E.h | |
50 | --- enlightenment-0.16.7.1.orig/src/E.h 2004-08-20 23:35:46.000000000 +0200 | |
51 | +++ enlightenment-0.16.7.1/src/E.h 2004-10-01 01:23:11.338028464 +0200 | |
52 | @@ -2381,6 +2381,7 @@ | |
53 | ||
54 | /* misc.c */ | |
55 | void BlumFlimFrub(void); | |
56 | +const char *EDirConf(void); | |
57 | const char *EDirRoot(void); | |
58 | const char *EDirBin(void); | |
59 | void EDirUserSet(const char *d); | |
60 | diff -Nur enlightenment-0.16.7.1.orig/src/file.c enlightenment-0.16.7.1/src/file.c | |
61 | --- enlightenment-0.16.7.1.orig/src/file.c 2004-08-20 23:35:46.000000000 +0200 | |
62 | +++ enlightenment-0.16.7.1/src/file.c 2004-10-01 01:30:04.091280432 +0200 | |
63 | @@ -300,7 +300,7 @@ | |
64 | { | |
65 | struct stat st; | |
66 | ||
67 | - EDBUG(9, "filesize"); | |
68 | + EDBUG(9, "fileinode"); | |
69 | if ((!s) || (!*s)) | |
70 | EDBUG_RETURN(0); | |
71 | if (stat(s, &st) < 0) | |
72 | @@ -313,7 +313,7 @@ | |
73 | { | |
74 | struct stat st; | |
75 | ||
76 | - EDBUG(9, "filesize"); | |
77 | + EDBUG(9, "filedev"); | |
78 | if ((!s) || (!*s)) | |
79 | EDBUG_RETURN(0); | |
80 | if (stat(s, &st) < 0) | |
81 | diff -Nur enlightenment-0.16.7.1.orig/src/misc.c enlightenment-0.16.7.1/src/misc.c | |
82 | --- enlightenment-0.16.7.1.orig/src/misc.c 2004-08-20 23:35:46.000000000 +0200 | |
83 | +++ enlightenment-0.16.7.1/src/misc.c 2004-10-01 01:30:25.558016992 +0200 | |
84 | @@ -76,6 +76,13 @@ | |
85 | return ENLIGHTENMENT_ROOT; | |
86 | } | |
87 | ||
88 | +const char * | |
89 | +EDirConf(void) | |
90 | +{ | |
91 | + return ENLIGHTENMENT_CONF; | |
92 | +} | |
93 | + | |
94 | + | |
95 | void | |
96 | EDirUserSet(const char *d) | |
97 | { | |
98 | diff -Nur enlightenment-0.16.7.1.orig/src/setup.c enlightenment-0.16.7.1/src/setup.c | |
99 | --- enlightenment-0.16.7.1.orig/src/setup.c 2004-08-20 23:35:46.000000000 +0200 | |
100 | +++ enlightenment-0.16.7.1/src/setup.c 2004-10-01 01:26:45.939404096 +0200 | |
101 | @@ -568,6 +568,7 @@ | |
102 | { | |
103 | char s[1024]; | |
104 | ||
105 | + // EDirConf ? | |
106 | Esetenv("EVERSION", ENLIGHTENMENT_VERSION, 1); | |
107 | Esetenv("EROOT", EDirRoot(), 1); | |
108 | Esetenv("EBIN", EDirBin(), 1); |