summaryrefslogtreecommitdiff
path: root/legacy/ecore
diff options
context:
space:
mode:
authorhandyande <handyande>2004-05-08 14:51:05 +0000
committerhandyande <handyande@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2004-05-08 14:51:05 +0000
commit8db5850a36866caa99cfaa219171150f528b9fce (patch)
tree396df3101556b14a3181df222e96c64b75af220b /legacy/ecore
parent093bd1d9c24d50cf440231e9ada30ead0e7cccc7 (diff)
WARNING: API CHANGE. Ecore_Config should now be Ecore compliant, there you go Raster ;)
SVN revision: 10126
Diffstat (limited to 'legacy/ecore')
-rw-r--r--legacy/ecore/examples/config_basic_example.c30
-rw-r--r--legacy/ecore/src/lib/ecore_config/Ecore_Config.h98
-rw-r--r--legacy/ecore/src/lib/ecore_config/convenience.c42
-rw-r--r--legacy/ecore/src/lib/ecore_config/ecore_config.c142
-rw-r--r--legacy/ecore/src/lib/ecore_config/edb.c30
-rw-r--r--legacy/ecore/src/lib/ecore_config/ipc_ecore.c18
-rw-r--r--legacy/ecore/src/lib/ecore_config/ipc_main.c32
7 files changed, 196 insertions, 196 deletions
diff --git a/legacy/ecore/examples/config_basic_example.c b/legacy/ecore/examples/config_basic_example.c
index 1d917369c9..256be851a0 100644
--- a/legacy/ecore/examples/config_basic_example.c
+++ b/legacy/ecore/examples/config_basic_example.c
@@ -18,11 +18,11 @@ char *rgb_val;
18char *thm_val; 18char *thm_val;
19 19
20void set_defaults (void) { 20void set_defaults (void) {
21 ecore_config_default_int(INT_VAL_KEY, 0); 21 ecore_config_int_default(INT_VAL_KEY, 0);
22 ecore_config_default_float(FLT_VAL_KEY, 0.0); 22 ecore_config_float_default(FLT_VAL_KEY, 0.0);
23 ecore_config_default_string(STR_VAL_KEY, "test1"); 23 ecore_config_string_default(STR_VAL_KEY, "test1");
24 ecore_config_default_rgb(RGB_VAL_KEY, "#000000"); 24 ecore_config_rgb_default(RGB_VAL_KEY, "#000000");
25 ecore_config_default_theme(THM_VAL_KEY, "default"); 25 ecore_config_theme_default(THM_VAL_KEY, "default");
26} 26}
27 27
28void get_settings (void) { 28void get_settings (void) {
@@ -31,11 +31,11 @@ void get_settings (void) {
31 */ 31 */
32 set_defaults(); 32 set_defaults();
33 ecore_config_load(); 33 ecore_config_load();
34 int_val = ecore_config_get_int(INT_VAL_KEY); 34 int_val = ecore_config_int_get(INT_VAL_KEY);
35 flt_val = ecore_config_get_float(FLT_VAL_KEY); 35 flt_val = ecore_config_float_get(FLT_VAL_KEY);
36 str_val = ecore_config_get_string(STR_VAL_KEY); 36 str_val = ecore_config_string_get(STR_VAL_KEY);
37 rgb_val = ecore_config_get_rgbstr(RGB_VAL_KEY); 37 rgb_val = ecore_config_rgbstr_get(RGB_VAL_KEY);
38 thm_val = ecore_config_get_theme(THM_VAL_KEY); 38 thm_val = ecore_config_theme_get(THM_VAL_KEY);
39} 39}
40 40
41void change_settings(void) { 41void change_settings(void) {
@@ -63,11 +63,11 @@ void change_settings(void) {
63} 63}
64 64
65void save_settings (void) { 65void save_settings (void) {
66 ecore_config_set_int(INT_VAL_KEY, int_val); 66 ecore_config_int_set(INT_VAL_KEY, int_val);
67 ecore_config_set_float(FLT_VAL_KEY, flt_val); 67 ecore_config_float_set(FLT_VAL_KEY, flt_val);
68 ecore_config_set_string(STR_VAL_KEY, str_val); 68 ecore_config_string_set(STR_VAL_KEY, str_val);
69 ecore_config_set_rgb(RGB_VAL_KEY, rgb_val); 69 ecore_config_rgb_set(RGB_VAL_KEY, rgb_val);
70 ecore_config_set_theme(THM_VAL_KEY, thm_val); 70 ecore_config_theme_set(THM_VAL_KEY, thm_val);
71 ecore_config_save(); 71 ecore_config_save();
72} 72}
73 73
diff --git a/legacy/ecore/src/lib/ecore_config/Ecore_Config.h b/legacy/ecore/src/lib/ecore_config/Ecore_Config.h
index 37d2491829..95e741deff 100644
--- a/legacy/ecore/src/lib/ecore_config/Ecore_Config.h
+++ b/legacy/ecore/src/lib/ecore_config/Ecore_Config.h
@@ -81,8 +81,8 @@ typedef struct Ecore_Config_Prop
81{ 81{
82 char *key; ///< Property key. 82 char *key; ///< Property key.
83 char *description; ///< Description set by ecore_config_descibe. 83 char *description; ///< Description set by ecore_config_descibe.
84 char short_opt; 84 char short_opt; ///< short identifier on command line (-f)
85 char *long_opt; 85 char *long_opt; ///< long identifier on command line (--foo)
86 char *ptr; ///< Used as the value when the property is a string or theme. 86 char *ptr; ///< Used as the value when the property is a string or theme.
87 Ecore_Config_Type type; ///< Property type. 87 Ecore_Config_Type type; ///< Property type.
88 long val; ///< Used as the value when the property is an integer, float or colour. 88 long val; ///< Used as the value when the property is an integer, float or colour.
@@ -130,47 +130,47 @@ extern "C"
130 extern char *__ecore_config_app_name; 130 extern char *__ecore_config_app_name;
131 131
132 Ecore_Config_Prop *ecore_config_get(const char *key); 132 Ecore_Config_Prop *ecore_config_get(const char *key);
133 const char *ecore_config_get_type(const Ecore_Config_Prop * e); 133 const char *ecore_config_type_get(const Ecore_Config_Prop * e);
134 void *ecore_config_get_data(const char *key); 134 void *ecore_config_data_get(const char *key);
135 char *ecore_config_get_string(const char *key); 135 char *ecore_config_string_get(const char *key);
136 long ecore_config_get_int(const char *key); 136 long ecore_config_int_get(const char *key);
137 int ecore_config_get_rgb(const char *key, int *r, int *g, 137 int ecore_config_rgb_get(const char *key, int *r, int *g,
138 int *b); 138 int *b);
139 float ecore_config_get_float(const char *key); 139 char *ecore_config_rgbstr_get(const char *key);
140 char *ecore_config_get_theme(const char *key); 140 float ecore_config_float_get(const char *key);
141 char *ecore_config_get_as_string(const char *key); 141 char *ecore_config_theme_get(const char *key);
142 char *ecore_config_as_string_get(const char *key);
142 int ecore_config_describe(const char *key, char *desc); 143 int ecore_config_describe(const char *key, char *desc);
143 int ecore_config_set_short_opt(const char *key, 144 int ecore_config_short_opt_set(const char *key,
144 char short_opt); 145 char short_opt);
145 int ecore_config_set_long_opt(const char *key, 146 int ecore_config_long_opt_set(const char *key,
146 char *long_opt); 147 char *long_opt);
147 int ecore_config_set(const char *key, char *val); 148 int ecore_config_set(const char *key, char *val);
148 int ecore_config_set_typed(const char *key, void *val, 149 int ecore_config_typed_set(const char *key, void *val,
149 int type); 150 int type);
150 int ecore_config_set_string(const char *key, char *val); 151 int ecore_config_string_set(const char *key, char *val);
151 int ecore_config_set_int(const char *key, int val); 152 int ecore_config_int_set(const char *key, int val);
152 int ecore_config_set_rgb(const char *key, char *val); 153 int ecore_config_rgb_set(const char *key, char *val);
153 char *ecore_config_get_rgbstr(const char *key); 154 int ecore_config_float_set(const char *key, float val);
154 int ecore_config_set_float(const char *key, float val); 155 int ecore_config_theme_set(const char *key, char *val);
155 int ecore_config_set_theme(const char *key, char *val); 156 int ecore_config_theme_preview_group_set(const char *key,
156 int ecore_config_set_theme_preview_group(const char *key,
157 char *group); 157 char *group);
158 int ecore_config_set_as_string(const char *key, char *val); 158 int ecore_config_as_string_set(const char *key, char *val);
159 159
160 int ecore_config_default(const char *key, char *val, 160 int ecore_config_default(const char *key, char *val,
161 float lo, float hi, float step); 161 float lo, float hi, float step);
162 int ecore_config_default_typed(const char *key, void *val, 162 int ecore_config_typed_default(const char *key, void *val,
163 int type); 163 int type);
164 int ecore_config_default_int(const char *key, int val); 164 int ecore_config_int_default(const char *key, int val);
165 int ecore_config_default_int_bound(const char *key, int val, 165 int ecore_config_int_default_bound(const char *key, int val,
166 int lo, int hi, int step); 166 int lo, int hi, int step);
167 int ecore_config_default_string(const char *key, char *val); 167 int ecore_config_string_default(const char *key, char *val);
168 int ecore_config_default_float(const char *key, float val); 168 int ecore_config_float_default(const char *key, float val);
169 int ecore_config_default_float_bound(const char *key, 169 int ecore_config_float_default_bound(const char *key,
170 float val, float lo, 170 float val, float lo,
171 float hi, float step); 171 float hi, float step);
172 int ecore_config_default_rgb(const char *key, char *val); 172 int ecore_config_rgb_default(const char *key, char *val);
173 int ecore_config_default_theme(const char *key, char *val); 173 int ecore_config_theme_default(const char *key, char *val);
174 174
175 int ecore_config_listen(const char *name, const char *key, 175 int ecore_config_listen(const char *name, const char *key,
176 Ecore_Config_Listener listener, 176 Ecore_Config_Listener listener,
@@ -178,27 +178,27 @@ extern "C"
178 int ecore_config_deaf(const char *name, const char *key, 178 int ecore_config_deaf(const char *name, const char *key,
179 Ecore_Config_Listener listener); 179 Ecore_Config_Listener listener);
180 Ecore_Config_Prop *ecore_config_dst(Ecore_Config_Prop * e); 180 Ecore_Config_Prop *ecore_config_dst(Ecore_Config_Prop * e);
181 int ecore_config_guess_type(const char *key, char *val); 181 int ecore_config_type_guess(const char *key, char *val);
182 182
183 Ecore_Config_Bundle *ecore_config_bundle_new(Ecore_Config_Server * srv, 183 Ecore_Config_Bundle *ecore_config_bundle_new(Ecore_Config_Server * srv,
184 const char *id); 184 const char *id);
185 Ecore_Config_Bundle *ecore_config_bundle_get_1st(Ecore_Config_Server * srv); 185 Ecore_Config_Bundle *ecore_config_bundle_1st_get(Ecore_Config_Server * srv);
186 Ecore_Config_Bundle *ecore_config_bundle_get_next(Ecore_Config_Bundle * ns); 186 Ecore_Config_Bundle *ecore_config_bundle_next_get(Ecore_Config_Bundle * ns);
187 Ecore_Config_Bundle *ecore_config_bundle_get_by_serial(Ecore_Config_Server * 187 Ecore_Config_Bundle *ecore_config_bundle_by_serial_get(Ecore_Config_Server *
188 srv, long serial); 188 srv, long serial);
189 Ecore_Config_Bundle *ecore_config_bundle_get_by_label(Ecore_Config_Server * 189 Ecore_Config_Bundle *ecore_config_bundle_by_label_get(Ecore_Config_Server *
190 srv, 190 srv,
191 const char *label); 191 const char *label);
192 long ecore_config_bundle_get_serial(Ecore_Config_Bundle * ns); 192 long ecore_config_bundle_serial_get(Ecore_Config_Bundle * ns);
193 char *ecore_config_bundle_get_label(Ecore_Config_Bundle * ns); 193 char *ecore_config_bundle_label_get(Ecore_Config_Bundle * ns);
194 194
195 int ecore_config_init(char *name); 195 int ecore_config_init(char *name);
196 int ecore_config_shutdown(void); 196 int ecore_config_shutdown(void);
197 197
198 int ecore_config_load(void); 198 int ecore_config_load(void);
199 int ecore_config_load_file(char *file); 199 int ecore_config_file_load(char *file);
200 int ecore_config_save(void); 200 int ecore_config_save(void);
201 int ecore_config_save_file(char *file); 201 int ecore_config_file_save(char *file);
202 202
203/* error codes */ 203/* error codes */
204# define ECORE_CONFIG_ERR_NOTSUPP (-16) 204# define ECORE_CONFIG_ERR_NOTSUPP (-16)
@@ -219,9 +219,9 @@ extern "C"
219# define ECORE_CONFIG_ERR_FAIL (-1) ///< Failure result. 219# define ECORE_CONFIG_ERR_FAIL (-1) ///< Failure result.
220# define ECORE_CONFIG_ERR_SUCC (0) ///< Success result. 220# define ECORE_CONFIG_ERR_SUCC (0) ///< Success result.
221 221
222# define ECORE_CONFIG_PARSE_HELP (-2) 222# define ECORE_CONFIG_PARSE_HELP (-2) ///< Help was displayed
223# define ECORE_CONFIG_PARSE_EXIT (-1) 223# define ECORE_CONFIG_PARSE_EXIT (-1) ///< An error occurred
224# define ECORE_CONFIG_PARSE_CONTINUE (0) 224# define ECORE_CONFIG_PARSE_CONTINUE (0) ///< Arguments parsed successfully
225 225
226/* convenience mathods in convenience.c */ 226/* convenience mathods in convenience.c */
227 int ecore_config_evas_font_path_apply(Evas * evas); 227 int ecore_config_evas_font_path_apply(Evas * evas);
@@ -232,33 +232,33 @@ extern "C"
232 int ecore_config_create(const char *key, void *val, 232 int ecore_config_create(const char *key, void *val,
233 char short_opt, char *long_opt, 233 char short_opt, char *long_opt,
234 char *desc); 234 char *desc);
235 int ecore_config_create_typed(const char *key, void *val, 235 int ecore_config_typed_create(const char *key, void *val,
236 int type, char short_opt, 236 int type, char short_opt,
237 char *long_opt, char *desc); 237 char *long_opt, char *desc);
238 int ecore_config_create_int(const char *key, int val, 238 int ecore_config_int_create(const char *key, int val,
239 char short_opt, char *long_opt, 239 char short_opt, char *long_opt,
240 char *desc); 240 char *desc);
241 int ecore_config_create_int_bound(const char *key, int val, 241 int ecore_config_int_create_bound(const char *key, int val,
242 int low, int high, 242 int low, int high,
243 int step, char short_opt, 243 int step, char short_opt,
244 char *long_opt, 244 char *long_opt,
245 char *desc); 245 char *desc);
246 int ecore_config_create_string(const char *key, char *val, 246 int ecore_config_string_create(const char *key, char *val,
247 char short_opt, 247 char short_opt,
248 char *long_opt, char *desc); 248 char *long_opt, char *desc);
249 int ecore_config_create_float(const char *key, float val, 249 int ecore_config_float_create(const char *key, float val,
250 char short_opt, char *long_opt, 250 char short_opt, char *long_opt,
251 char *desc); 251 char *desc);
252 int ecore_config_create_float_bound(const char *key, 252 int ecore_config_float_create_bound(const char *key,
253 float val, float low, 253 float val, float low,
254 float high, float step, 254 float high, float step,
255 char short_opt, 255 char short_opt,
256 char *long_opt, 256 char *long_opt,
257 char *desc); 257 char *desc);
258 int ecore_config_create_rgb(const char *key, char *val, 258 int ecore_config_rgb_create(const char *key, char *val,
259 char short_opt, char *long_opt, 259 char short_opt, char *long_opt,
260 char *desc); 260 char *desc);
261 int ecore_config_create_theme(const char *key, char *val, 261 int ecore_config_theme_create(const char *key, char *val,
262 char short_opt, char *long_opt, 262 char short_opt, char *long_opt,
263 char *desc); 263 char *desc);
264 264
diff --git a/legacy/ecore/src/lib/ecore_config/convenience.c b/legacy/ecore/src/lib/ecore_config/convenience.c
index 2393604f56..5df9c3b3a1 100644
--- a/legacy/ecore/src/lib/ecore_config/convenience.c
+++ b/legacy/ecore/src/lib/ecore_config/convenience.c
@@ -14,41 +14,41 @@ int
14ecore_config_create(const char *key, void *val, char short_opt, char *long_opt, 14ecore_config_create(const char *key, void *val, char short_opt, char *long_opt,
15 char *desc) 15 char *desc)
16{ 16{
17 int type = ecore_config_guess_type(key, val); 17 int type = ecore_config_type_guess(key, val);
18 18
19 return ecore_config_create_typed(key, val, type, short_opt, long_opt, desc); 19 return ecore_config_typed_create(key, val, type, short_opt, long_opt, desc);
20} 20}
21 21
22int 22int
23ecore_config_create_typed(const char *key, void *val, int type, char short_opt, 23ecore_config_typed_create(const char *key, void *val, int type, char short_opt,
24 char *long_opt, char *desc) 24 char *long_opt, char *desc)
25{ 25{
26 int ret; 26 int ret;
27 27
28 if ((ret = 28 if ((ret =
29 ecore_config_default_typed(key, val, type)) != ECORE_CONFIG_ERR_SUCC) 29 ecore_config_typed_default(key, val, type)) != ECORE_CONFIG_ERR_SUCC)
30 return ret; 30 return ret;
31 if ((ret = 31 if ((ret =
32 ecore_config_set_short_opt(key, short_opt)) != ECORE_CONFIG_ERR_SUCC) 32 ecore_config_short_opt_set(key, short_opt)) != ECORE_CONFIG_ERR_SUCC)
33 return ret; 33 return ret;
34 if ((ret = 34 if ((ret =
35 ecore_config_set_long_opt(key, long_opt)) != ECORE_CONFIG_ERR_SUCC) 35 ecore_config_long_opt_set(key, long_opt)) != ECORE_CONFIG_ERR_SUCC)
36 return ret; 36 return ret;
37 ret = ecore_config_describe(key, desc); 37 ret = ecore_config_describe(key, desc);
38 return ret; 38 return ret;
39} 39}
40 40
41int 41int
42ecore_config_create_int(const char *key, int val, char short_opt, 42ecore_config_int_create(const char *key, int val, char short_opt,
43 char *long_opt, char *desc) 43 char *long_opt, char *desc)
44{ 44{
45 return 45 return
46 ecore_config_create_typed(key, (void *)&val, PT_INT, short_opt, long_opt, 46 ecore_config_typed_create(key, (void *)&val, PT_INT, short_opt, long_opt,
47 desc); 47 desc);
48} 48}
49 49
50int 50int
51ecore_config_create_int_bound(const char *key, int val, int low, int high, 51ecore_config_int_create_bound(const char *key, int val, int low, int high,
52 int step, char short_opt, char *long_opt, 52 int step, char short_opt, char *long_opt,
53 char *desc) 53 char *desc)
54{ 54{
@@ -56,7 +56,7 @@ ecore_config_create_int_bound(const char *key, int val, int low, int high,
56 int ret; 56 int ret;
57 57
58 ret = 58 ret =
59 ecore_config_create_typed(key, (void *)&val, PT_INT, short_opt, long_opt, 59 ecore_config_typed_create(key, (void *)&val, PT_INT, short_opt, long_opt,
60 desc); 60 desc);
61 if (ret != ECORE_CONFIG_ERR_SUCC) 61 if (ret != ECORE_CONFIG_ERR_SUCC)
62 return ret; 62 return ret;
@@ -73,25 +73,25 @@ ecore_config_create_int_bound(const char *key, int val, int low, int high,
73} 73}
74 74
75int 75int
76ecore_config_create_string(const char *key, char *val, char short_opt, 76ecore_config_string_create(const char *key, char *val, char short_opt,
77 char *long_opt, char *desc) 77 char *long_opt, char *desc)
78{ 78{
79 return 79 return
80 ecore_config_create_typed(key, (void *)val, PT_STR, short_opt, long_opt, 80 ecore_config_typed_create(key, (void *)val, PT_STR, short_opt, long_opt,
81 desc); 81 desc);
82} 82}
83 83
84int 84int
85ecore_config_create_float(const char *key, float val, char short_opt, 85ecore_config_float_create(const char *key, float val, char short_opt,
86 char *long_opt, char *desc) 86 char *long_opt, char *desc)
87{ 87{
88 return 88 return
89 ecore_config_create_typed(key, (void *)&val, PT_FLT, short_opt, long_opt, 89 ecore_config_typed_create(key, (void *)&val, PT_FLT, short_opt, long_opt,
90 desc); 90 desc);
91} 91}
92 92
93int 93int
94ecore_config_create_float_bound(const char *key, float val, float low, 94ecore_config_float_create_bound(const char *key, float val, float low,
95 float high, float step, char short_opt, 95 float high, float step, char short_opt,
96 char *long_opt, char *desc) 96 char *long_opt, char *desc)
97{ 97{
@@ -99,7 +99,7 @@ ecore_config_create_float_bound(const char *key, float val, float low,
99 int ret; 99 int ret;
100 100
101 ret = 101 ret =
102 ecore_config_create_typed(key, (void *)&val, PT_FLT, short_opt, long_opt, 102 ecore_config_typed_create(key, (void *)&val, PT_FLT, short_opt, long_opt,
103 desc); 103 desc);
104 e = ecore_config_get(key); 104 e = ecore_config_get(key);
105 if (e) 105 if (e)
@@ -114,20 +114,20 @@ ecore_config_create_float_bound(const char *key, float val, float low,
114} 114}
115 115
116int 116int
117ecore_config_create_rgb(const char *key, char *val, char short_opt, 117ecore_config_rgb_create(const char *key, char *val, char short_opt,
118 char *long_opt, char *desc) 118 char *long_opt, char *desc)
119{ 119{
120 return 120 return
121 ecore_config_create_typed(key, (void *)val, PT_RGB, short_opt, long_opt, 121 ecore_config_typed_create(key, (void *)val, PT_RGB, short_opt, long_opt,
122 desc); 122 desc);
123} 123}
124 124
125int 125int
126ecore_config_create_theme(const char *key, char *val, char short_opt, 126ecore_config_theme_create(const char *key, char *val, char short_opt,
127 char *long_opt, char *desc) 127 char *long_opt, char *desc)
128{ 128{
129 return 129 return
130 ecore_config_create_typed(key, (void *)val, PT_THM, short_opt, long_opt, 130 ecore_config_typed_create(key, (void *)val, PT_THM, short_opt, long_opt,
131 desc); 131 desc);
132} 132}
133 133
@@ -145,7 +145,7 @@ ecore_config_evas_font_path_apply(Evas * evas)
145{ 145{
146 char *font_path, *font_path_tmp, *ptr, *end; 146 char *font_path, *font_path_tmp, *ptr, *end;
147 147
148 font_path = ecore_config_get_string("/e/font/path"); 148 font_path = ecore_config_string_get("/e/font/path");
149 149
150 if (!font_path) 150 if (!font_path)
151 return ECORE_CONFIG_ERR_NODATA; 151 return ECORE_CONFIG_ERR_NODATA;
diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config.c b/legacy/ecore/src/lib/ecore_config/ecore_config.c
index 4d8258c3db..3e71b2981f 100644
--- a/legacy/ecore/src/lib/ecore_config/ecore_config.c
+++ b/legacy/ecore/src/lib/ecore_config/ecore_config.c
@@ -110,7 +110,7 @@ ecore_config_get(const char *key)
110 * string "not found" is returned. 110 * string "not found" is returned.
111 */ 111 */
112const char * 112const char *
113ecore_config_get_type(const Ecore_Config_Prop * e) 113ecore_config_type_get(const Ecore_Config_Prop * e)
114{ 114{
115 if (e) 115 if (e)
116 { 116 {
@@ -125,7 +125,7 @@ ecore_config_get_type(const Ecore_Config_Prop * e)
125 * @return Data pointer used by the property. 125 * @return Data pointer used by the property.
126 */ 126 */
127void * 127void *
128ecore_config_get_data(const char *key) 128ecore_config_data_get(const char *key)
129{ 129{
130 Ecore_Config_Prop *e; 130 Ecore_Config_Prop *e;
131 131
@@ -141,7 +141,7 @@ ecore_config_get_data(const char *key)
141 * property is not a string or is not set. 141 * property is not a string or is not set.
142 */ 142 */
143char * 143char *
144ecore_config_get_string(const char *key) 144ecore_config_string_get(const char *key)
145{ 145{
146 Ecore_Config_Prop *e; 146 Ecore_Config_Prop *e;
147 147
@@ -156,7 +156,7 @@ ecore_config_get_string(const char *key)
156 * property is not an integer or is not set. 156 * property is not an integer or is not set.
157 */ 157 */
158long 158long
159ecore_config_get_int(const char *key) 159ecore_config_int_get(const char *key)
160{ 160{
161 Ecore_Config_Prop *e; 161 Ecore_Config_Prop *e;
162 162
@@ -171,7 +171,7 @@ ecore_config_get_int(const char *key)
171 * property is not a float or is not set. 171 * property is not a float or is not set.
172 */ 172 */
173float 173float
174ecore_config_get_float(const char *key) 174ecore_config_float_get(const char *key)
175{ 175{
176 Ecore_Config_Prop *e; 176 Ecore_Config_Prop *e;
177 177
@@ -191,7 +191,7 @@ ecore_config_get_float(const char *key)
191 * otherwise. 191 * otherwise.
192 */ 192 */
193int 193int
194ecore_config_get_rgb(const char *key, int *r, int *g, int *b) 194ecore_config_rgb_get(const char *key, int *r, int *g, int *b)
195{ 195{
196 Ecore_Config_Prop *e; 196 Ecore_Config_Prop *e;
197 197
@@ -213,12 +213,12 @@ ecore_config_get_rgb(const char *key, int *r, int *g, int *b)
213 * @return A string of hexadecimal characters in the format #rrggbb. 213 * @return A string of hexadecimal characters in the format #rrggbb.
214 */ 214 */
215char * 215char *
216ecore_config_get_rgbstr(const char *key) 216ecore_config_rgbstr_get(const char *key)
217{ 217{
218 char *r; 218 char *r;
219 219
220 r = NULL; 220 r = NULL;
221 esprintf(&r, "#%06x", ecore_config_get_int(key)); 221 esprintf(&r, "#%06x", ecore_config_int_get(key));
222 return r; 222 return r;
223} 223}
224 224
@@ -229,7 +229,7 @@ ecore_config_get_rgbstr(const char *key)
229 * NULL if the property is not a theme or is not set. 229 * NULL if the property is not a theme or is not set.
230 */ 230 */
231char * 231char *
232ecore_config_get_theme(const char *key) 232ecore_config_theme_get(const char *key)
233{ 233{
234 Ecore_Config_Prop *e; 234 Ecore_Config_Prop *e;
235 235
@@ -244,7 +244,7 @@ ecore_config_get_theme(const char *key)
244 * returned if the property does not exist. 244 * returned if the property does not exist.
245 */ 245 */
246char * 246char *
247ecore_config_get_as_string(const char *key) 247ecore_config_as_string_get(const char *key)
248{ 248{
249 Ecore_Config_Prop *e; 249 Ecore_Config_Prop *e;
250 char *r; 250 char *r;
@@ -254,7 +254,7 @@ ecore_config_get_as_string(const char *key)
254 E(0, "no such property, \"%s\"...\n", key); 254 E(0, "no such property, \"%s\"...\n", key);
255 else 255 else
256 { 256 {
257 const char *type = ecore_config_get_type(e); 257 const char *type = ecore_config_type_get(e);
258 258
259 switch (e->type) 259 switch (e->type)
260 { 260 {
@@ -262,21 +262,21 @@ ecore_config_get_as_string(const char *key)
262 esprintf(&r, "%s:%s=<nil>", key, type); 262 esprintf(&r, "%s:%s=<nil>", key, type);
263 break; 263 break;
264 case PT_INT: 264 case PT_INT:
265 esprintf(&r, "%s:%s=%ld", key, type, ecore_config_get_int(key)); 265 esprintf(&r, "%s:%s=%ld", key, type, ecore_config_int_get(key));
266 break; 266 break;
267 case PT_FLT: 267 case PT_FLT:
268 esprintf(&r, "%s:%s=%lf", key, type, ecore_config_get_float(key)); 268 esprintf(&r, "%s:%s=%lf", key, type, ecore_config_float_get(key));
269 break; 269 break;
270 case PT_STR: 270 case PT_STR:
271 esprintf(&r, "%s:%s=\"%s\"", key, type, 271 esprintf(&r, "%s:%s=\"%s\"", key, type,
272 ecore_config_get_string(key)); 272 ecore_config_string_get(key));
273 break; 273 break;
274 case PT_RGB: 274 case PT_RGB:
275 esprintf(&r, "%s:%s=#%06x", key, type, ecore_config_get_int(key)); 275 esprintf(&r, "%s:%s=#%06x", key, type, ecore_config_int_get(key));
276 break; 276 break;
277 case PT_THM: 277 case PT_THM:
278 esprintf(&r, "%s:%s=\"%s\"", key, type, 278 esprintf(&r, "%s:%s=\"%s\"", key, type,
279 ecore_config_get_theme(key)); 279 ecore_config_theme_get(key));
280 break; 280 break;
281 default: 281 default:
282 esprintf(&r, "%s:unknown_type", key); 282 esprintf(&r, "%s:unknown_type", key);
@@ -354,7 +354,7 @@ ecore_config_bound(Ecore_Config_Prop * e)
354 * val is NULL, PT_NIL will be returned. 354 * val is NULL, PT_NIL will be returned.
355 */ 355 */
356int 356int
357ecore_config_guess_type(const char *key, char *val) 357ecore_config_type_guess(const char *key, char *val)
358{ 358{
359 Ecore_Config_Prop *p; 359 Ecore_Config_Prop *p;
360 char *l; 360 char *l;
@@ -382,7 +382,7 @@ ecore_config_guess_type(const char *key, char *val)
382} 382}
383 383
384static int 384static int
385ecore_config_val_typed(Ecore_Config_Prop * e, void *val, int type) 385ecore_config_typed_val(Ecore_Config_Prop * e, void *val, int type)
386{ 386{
387 char *l; 387 char *l;
388 long v; 388 long v;
@@ -456,7 +456,7 @@ ecore_config_val_typed(Ecore_Config_Prop * e, void *val, int type)
456} 456}
457 457
458static int 458static int
459ecore_config_add_typed(const char *key, void *val, int type) 459ecore_config_typed_add(const char *key, void *val, int type)
460{ 460{
461 Ecore_Config_Prop *e; 461 Ecore_Config_Prop *e;
462 Ecore_Config_Bundle *t; 462 Ecore_Config_Bundle *t;
@@ -474,7 +474,7 @@ ecore_config_add_typed(const char *key, void *val, int type)
474 474
475 if (!val) 475 if (!val)
476 e->type = PT_NIL; 476 e->type = PT_NIL;
477 else if (ecore_config_val_typed(e, val, type) == ECORE_CONFIG_ERR_OOM) 477 else if (ecore_config_typed_val(e, val, type) == ECORE_CONFIG_ERR_OOM)
478 goto ret_free_key; 478 goto ret_free_key;
479 479
480 e->next = t ? t->data : NULL; 480 e->next = t ? t->data : NULL;
@@ -496,8 +496,8 @@ ecore_config_add(const char *key, char *val)
496{ 496{
497 int type; 497 int type;
498 498
499 type = ecore_config_guess_type(key, val); 499 type = ecore_config_type_guess(key, val);
500 return ecore_config_add_typed(key, val, type); 500 return ecore_config_typed_add(key, val, type);
501} 501}
502 502
503/** 503/**
@@ -519,7 +519,7 @@ ecore_config_describe(const char *key, char *desc)
519} 519}
520 520
521int 521int
522ecore_config_set_short_opt(const char *key, char short_opt) 522ecore_config_short_opt_set(const char *key, char short_opt)
523{ 523{
524 Ecore_Config_Prop *e; 524 Ecore_Config_Prop *e;
525 525
@@ -530,7 +530,7 @@ ecore_config_set_short_opt(const char *key, char short_opt)
530} 530}
531 531
532int 532int
533ecore_config_set_long_opt(const char *key, char *long_opt) 533ecore_config_long_opt_set(const char *key, char *long_opt)
534{ 534{
535 Ecore_Config_Prop *e; 535 Ecore_Config_Prop *e;
536 536
@@ -551,7 +551,7 @@ ecore_config_set_long_opt(const char *key, char *long_opt)
551 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully. 551 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully.
552 */ 552 */
553int 553int
554ecore_config_set_typed(const char *key, void *val, int type) 554ecore_config_typed_set(const char *key, void *val, int type)
555{ 555{
556 Ecore_Config_Prop *e; 556 Ecore_Config_Prop *e;
557 Ecore_Config_Listener_List *l; 557 Ecore_Config_Listener_List *l;
@@ -568,9 +568,9 @@ ecore_config_set_typed(const char *key, void *val, int type)
568 } 568 }
569*/ 569*/
570 if (!(e = ecore_config_get(key))) 570 if (!(e = ecore_config_get(key)))
571 return ecore_config_add_typed(key, val, type); 571 return ecore_config_typed_add(key, val, type);
572 572
573 if ((ret = ecore_config_val_typed(e, val, type)) == ECORE_CONFIG_ERR_SUCC) 573 if ((ret = ecore_config_typed_val(e, val, type)) == ECORE_CONFIG_ERR_SUCC)
574 { 574 {
575 for (l = e->listeners; l; l = l->next) 575 for (l = e->listeners; l; l = l->next)
576 l->listener(e->key, e->type, l->tag, l->data); 576 l->listener(e->key, e->type, l->tag, l->data);
@@ -578,7 +578,7 @@ ecore_config_set_typed(const char *key, void *val, int type)
578 else 578 else
579 { 579 {
580 E(0, 580 E(0,
581 "ecore_config_set_typed(\"%s\"): ecore_config_val_typed() failed: %d\n", 581 "ecore_config_typed_set(\"%s\"): ecore_config_typed_val() failed: %d\n",
582 key, ret); 582 key, ret);
583 } 583 }
584 584
@@ -599,19 +599,19 @@ ecore_config_set(const char *key, char *val)
599 int tmpi; 599 int tmpi;
600 float tmpf; 600 float tmpf;
601 601
602 type = ecore_config_guess_type(key, val); 602 type = ecore_config_type_guess(key, val);
603 if (type == PT_INT) 603 if (type == PT_INT)
604 { 604 {
605 tmpi = atoi(val); 605 tmpi = atoi(val);
606 return ecore_config_set_typed(key, (void *)&tmpi, type); 606 return ecore_config_typed_set(key, (void *)&tmpi, type);
607 } 607 }
608 else if (type == PT_FLT) 608 else if (type == PT_FLT)
609 { 609 {
610 tmpf = atof(val); 610 tmpf = atof(val);
611 return ecore_config_set_typed(key, (void *)&tmpf, type); 611 return ecore_config_typed_set(key, (void *)&tmpf, type);
612 } 612 }
613 else 613 else
614 return ecore_config_set_typed(key, (void *)val, type); 614 return ecore_config_typed_set(key, (void *)val, type);
615} 615}
616 616
617/** 617/**
@@ -621,7 +621,7 @@ ecore_config_set(const char *key, char *val)
621 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully. 621 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully.
622 */ 622 */
623int 623int
624ecore_config_set_as_string(const char *key, char *val) 624ecore_config_as_string_set(const char *key, char *val)
625{ 625{
626 return ecore_config_set(key, val); 626 return ecore_config_set(key, val);
627} 627}
@@ -633,9 +633,9 @@ ecore_config_set_as_string(const char *key, char *val)
633 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully. 633 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully.
634 */ 634 */
635int 635int
636ecore_config_set_int(const char *key, int val) 636ecore_config_int_set(const char *key, int val)
637{ 637{
638 return ecore_config_set_typed(key, (void *)&val, PT_INT); 638 return ecore_config_typed_set(key, (void *)&val, PT_INT);
639} 639}
640 640
641/** 641/**
@@ -645,9 +645,9 @@ ecore_config_set_int(const char *key, int val)
645 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully. 645 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully.
646 */ 646 */
647int 647int
648ecore_config_set_string(const char *key, char *val) 648ecore_config_string_set(const char *key, char *val)
649{ 649{
650 return ecore_config_set_typed(key, (void *)val, PT_STR); 650 return ecore_config_typed_set(key, (void *)val, PT_STR);
651} 651}
652 652
653/** 653/**
@@ -657,9 +657,9 @@ ecore_config_set_string(const char *key, char *val)
657 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully. 657 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully.
658 */ 658 */
659int 659int
660ecore_config_set_float(const char *key, float val) 660ecore_config_float_set(const char *key, float val)
661{ 661{
662 return ecore_config_set_typed(key, (void *)&val, PT_FLT); 662 return ecore_config_typed_set(key, (void *)&val, PT_FLT);
663} 663}
664 664
665/** 665/**
@@ -669,9 +669,9 @@ ecore_config_set_float(const char *key, float val)
669 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully. 669 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully.
670 */ 670 */
671int 671int
672ecore_config_set_rgb(const char *key, char *val) 672ecore_config_rgb_set(const char *key, char *val)
673{ 673{
674 return ecore_config_set_typed(key, (void *)val, PT_RGB); 674 return ecore_config_typed_set(key, (void *)val, PT_RGB);
675} 675}
676 676
677/** 677/**
@@ -681,9 +681,9 @@ ecore_config_set_rgb(const char *key, char *val)
681 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully. 681 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully.
682 */ 682 */
683int 683int
684ecore_config_set_theme(const char *key, char *val) 684ecore_config_theme_set(const char *key, char *val)
685{ 685{
686 return ecore_config_set_typed(key, (void *)val, PT_THM); 686 return ecore_config_typed_set(key, (void *)val, PT_THM);
687} 687}
688 688
689/** 689/**
@@ -693,7 +693,7 @@ ecore_config_set_theme(const char *key, char *val)
693 * @return ECORE_CONFIG_ERR_SUCC on success. 693 * @return ECORE_CONFIG_ERR_SUCC on success.
694 */ 694 */
695int 695int
696ecore_config_set_theme_preview_group(const char *key, char *group) 696ecore_config_theme_preview_group_set(const char *key, char *group)
697{ 697{
698 int ret; 698 int ret;
699 Ecore_Config_Prop *e; 699 Ecore_Config_Prop *e;
@@ -701,7 +701,7 @@ ecore_config_set_theme_preview_group(const char *key, char *group)
701 ret = ECORE_CONFIG_ERR_SUCC; 701 ret = ECORE_CONFIG_ERR_SUCC;
702 if (!(e = ecore_config_get(key))) 702 if (!(e = ecore_config_get(key)))
703 { /* prop doesn't exist yet */ 703 { /* prop doesn't exist yet */
704 if ((ret = ecore_config_add_typed(key, "", PT_THM)) != ECORE_CONFIG_ERR_SUCC) /* try to add it */ 704 if ((ret = ecore_config_typed_add(key, "", PT_THM)) != ECORE_CONFIG_ERR_SUCC) /* try to add it */
705 return ret; /* ...failed */ 705 return ret; /* ...failed */
706 if (!(e = ecore_config_get(key))) /* get handle */ 706 if (!(e = ecore_config_get(key))) /* get handle */
707 return ECORE_CONFIG_ERR_FAIL; 707 return ECORE_CONFIG_ERR_FAIL;
@@ -714,7 +714,7 @@ ecore_config_set_theme_preview_group(const char *key, char *group)
714} 714}
715 715
716int 716int
717ecore_config_default_typed(const char *key, void *val, int type) 717ecore_config_typed_default(const char *key, void *val, int type)
718{ 718{
719 int ret; 719 int ret;
720 Ecore_Config_Prop *e; 720 Ecore_Config_Prop *e;
@@ -723,7 +723,7 @@ ecore_config_default_typed(const char *key, void *val, int type)
723 723
724 if (!(e = ecore_config_get(key))) 724 if (!(e = ecore_config_get(key)))
725 { /* prop doesn't exist yet */ 725 { /* prop doesn't exist yet */
726 if ((ret = ecore_config_add_typed(key, val, type)) != ECORE_CONFIG_ERR_SUCC) /* try to add it */ 726 if ((ret = ecore_config_typed_add(key, val, type)) != ECORE_CONFIG_ERR_SUCC) /* try to add it */
727 return ret; /* ...failed */ 727 return ret; /* ...failed */
728 if (!(e = ecore_config_get(key))) /* get handle */ 728 if (!(e = ecore_config_get(key))) /* get handle */
729 return ECORE_CONFIG_ERR_FAIL; 729 return ECORE_CONFIG_ERR_FAIL;
@@ -750,8 +750,8 @@ ecore_config_default(const char *key, char *val, float lo, float hi, float step)
750 int ret, type; 750 int ret, type;
751 Ecore_Config_Prop *e; 751 Ecore_Config_Prop *e;
752 752
753 type = ecore_config_guess_type(key, val); 753 type = ecore_config_type_guess(key, val);
754 ret = ecore_config_default_typed(key, val, type); 754 ret = ecore_config_typed_default(key, val, type);
755 e = ecore_config_get(key); 755 e = ecore_config_get(key);
756 if (e) 756 if (e)
757 { 757 {
@@ -784,9 +784,9 @@ ecore_config_default(const char *key, char *val, float lo, float hi, float step)
784 * @return ECORE_CONFIG_ERR_SUCC if there are no problems. 784 * @return ECORE_CONFIG_ERR_SUCC if there are no problems.
785 */ 785 */
786int 786int
787ecore_config_default_int(const char *key, int val) 787ecore_config_int_default(const char *key, int val)
788{ 788{
789 return ecore_config_default_typed(key, (void *)&val, PT_INT); 789 return ecore_config_typed_default(key, (void *)&val, PT_INT);
790} 790}
791 791
792/** 792/**
@@ -803,13 +803,13 @@ ecore_config_default_int(const char *key, int val)
803 * @return ECORE_CONFIG_ERR_SUCC if there were no problems. 803 * @return ECORE_CONFIG_ERR_SUCC if there were no problems.
804 */ 804 */
805int 805int
806ecore_config_default_int_bound(const char *key, int val, int low, int high, 806ecore_config_int_default_bound(const char *key, int val, int low, int high,
807 int step) 807 int step)
808{ 808{
809 Ecore_Config_Prop *e; 809 Ecore_Config_Prop *e;
810 int ret; 810 int ret;
811 811
812 ret = ecore_config_default_typed(key, (void *)&val, PT_INT); 812 ret = ecore_config_typed_default(key, (void *)&val, PT_INT);
813 e = ecore_config_get(key); 813 e = ecore_config_get(key);
814 if (e) 814 if (e)
815 { 815 {
@@ -831,9 +831,9 @@ ecore_config_default_int_bound(const char *key, int val, int low, int high,
831 * @return ECORE_CONFIG_ERR_SUCC if there were no problems. 831 * @return ECORE_CONFIG_ERR_SUCC if there were no problems.
832 */ 832 */
833int 833int
834ecore_config_default_string(const char *key, char *val) 834ecore_config_string_default(const char *key, char *val)
835{ 835{
836 return ecore_config_default_typed(key, (void *)val, PT_STR); 836 return ecore_config_typed_default(key, (void *)val, PT_STR);
837} 837}
838 838
839/** 839/**
@@ -844,9 +844,9 @@ ecore_config_default_string(const char *key, char *val)
844 * @return ECORE_CONFIG_ERR_SUCC if there were no problems. 844 * @return ECORE_CONFIG_ERR_SUCC if there were no problems.
845 */ 845 */
846int 846int
847ecore_config_default_float(const char *key, float val) 847ecore_config_float_default(const char *key, float val)
848{ 848{
849 return ecore_config_default_typed(key, (void *)&val, PT_FLT); 849 return ecore_config_typed_default(key, (void *)&val, PT_FLT);
850} 850}
851 851
852/** 852/**
@@ -863,13 +863,13 @@ ecore_config_default_float(const char *key, float val)
863 * @return ECORE_CONFIG_ERR_SUCC if there were no problems. 863 * @return ECORE_CONFIG_ERR_SUCC if there were no problems.
864 */ 864 */
865int 865int
866ecore_config_default_float_bound(const char *key, float val, float low, 866ecore_config_float_default_bound(const char *key, float val, float low,
867 float high, float step) 867 float high, float step)
868{ 868{
869 Ecore_Config_Prop *e; 869 Ecore_Config_Prop *e;
870 int ret; 870 int ret;
871 871
872 ret = ecore_config_default_typed(key, (void *)&val, PT_FLT); 872 ret = ecore_config_typed_default(key, (void *)&val, PT_FLT);
873 e = ecore_config_get(key); 873 e = ecore_config_get(key);
874 if (e) 874 if (e)
875 { 875 {
@@ -891,9 +891,9 @@ ecore_config_default_float_bound(const char *key, float val, float low,
891 * @return ECORE_CONFIG_ERR_SUCC if there are no problems. 891 * @return ECORE_CONFIG_ERR_SUCC if there are no problems.
892 */ 892 */
893int 893int
894ecore_config_default_rgb(const char *key, char *val) 894ecore_config_rgb_default(const char *key, char *val)
895{ 895{
896 return ecore_config_default_typed(key, (void *)val, PT_RGB); 896 return ecore_config_typed_default(key, (void *)val, PT_RGB);
897} 897}
898 898
899/** 899/**
@@ -904,9 +904,9 @@ ecore_config_default_rgb(const char *key, char *val)
904 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully. 904 * @return ECORE_CONFIG_ERR_SUCC if the property is set successfully.
905 */ 905 */
906int 906int
907ecore_config_default_theme(const char *key, char *val) 907ecore_config_theme_default(const char *key, char *val)
908{ 908{
909 return ecore_config_default_typed(key, (void *)val, PT_THM); 909 return ecore_config_typed_default(key, (void *)val, PT_THM);
910} 910}
911 911
912/** 912/**
@@ -1024,7 +1024,7 @@ ecore_config_deaf(const char *name, const char *key,
1024 * @return Pointer to the first configuration bundle. 1024 * @return Pointer to the first configuration bundle.
1025 */ 1025 */
1026Ecore_Config_Bundle * 1026Ecore_Config_Bundle *
1027ecore_config_bundle_get_1st(Ecore_Config_Server * srv) 1027ecore_config_bundle_1st_get(Ecore_Config_Server * srv)
1028{ /* anchor: global, but read-only */ 1028{ /* anchor: global, but read-only */
1029 return srv->bundles; 1029 return srv->bundles;
1030} 1030}
@@ -1035,7 +1035,7 @@ ecore_config_bundle_get_1st(Ecore_Config_Server * srv)
1035 * @return The next configuration bundle. 1035 * @return The next configuration bundle.
1036 */ 1036 */
1037Ecore_Config_Bundle * 1037Ecore_Config_Bundle *
1038ecore_config_bundle_get_next(Ecore_Config_Bundle * ns) 1038ecore_config_bundle_next_get(Ecore_Config_Bundle * ns)
1039{ 1039{
1040 return ns ? ns->next : NULL; 1040 return ns ? ns->next : NULL;
1041} 1041}
@@ -1048,7 +1048,7 @@ ecore_config_bundle_get_next(Ecore_Config_Bundle * ns)
1048 * @return The configuration bundle with the given serial number. 1048 * @return The configuration bundle with the given serial number.
1049 */ 1049 */
1050Ecore_Config_Bundle * 1050Ecore_Config_Bundle *
1051ecore_config_bundle_get_by_serial(Ecore_Config_Server * srv, long serial) 1051ecore_config_bundle_by_serial_get(Ecore_Config_Server * srv, long serial)
1052{ 1052{
1053 Ecore_Config_Bundle *eb; 1053 Ecore_Config_Bundle *eb;
1054 1054
@@ -1081,7 +1081,7 @@ ecore_config_bundle_get_by_serial(Ecore_Config_Server * srv, long serial)
1081 * be found. 1081 * be found.
1082 */ 1082 */
1083Ecore_Config_Bundle * 1083Ecore_Config_Bundle *
1084ecore_config_bundle_get_by_label(Ecore_Config_Server * srv, const char *label) 1084ecore_config_bundle_by_label_get(Ecore_Config_Server * srv, const char *label)
1085{ 1085{
1086 Ecore_Config_Bundle *ns; 1086 Ecore_Config_Bundle *ns;
1087 1087
@@ -1102,7 +1102,7 @@ ecore_config_bundle_get_by_label(Ecore_Config_Server * srv, const char *label)
1102 * @return The bundle's identifier string, or -1 if ns is NULL. 1102 * @return The bundle's identifier string, or -1 if ns is NULL.
1103 */ 1103 */
1104long 1104long
1105ecore_config_bundle_get_serial(Ecore_Config_Bundle * ns) 1105ecore_config_bundle_serial_get(Ecore_Config_Bundle * ns)
1106{ 1106{
1107 return ns ? ns->serial : -1; 1107 return ns ? ns->serial : -1;
1108} 1108}
@@ -1113,7 +1113,7 @@ ecore_config_bundle_get_serial(Ecore_Config_Bundle * ns)
1113 * @return The bundle's identifer string. 1113 * @return The bundle's identifer string.
1114 */ 1114 */
1115char * 1115char *
1116ecore_config_bundle_get_label(Ecore_Config_Bundle * ns) 1116ecore_config_bundle_label_get(Ecore_Config_Bundle * ns)
1117{ 1117{
1118 return ns ? ns->identifier : NULL; 1118 return ns ? ns->identifier : NULL;
1119} 1119}
@@ -1231,8 +1231,8 @@ ecore_config_init(char *name)
1231 if ((buf = malloc(PATH_MAX * sizeof(char)))) 1231 if ((buf = malloc(PATH_MAX * sizeof(char))))
1232 { 1232 {
1233 snprintf(buf, PATH_MAX, "%s/.e/config.db", p); 1233 snprintf(buf, PATH_MAX, "%s/.e/config.db", p);
1234 if (ecore_config_load_file(buf) != 0) 1234 if (ecore_config_file_load(buf) != 0)
1235 if (ecore_config_load_file(PACKAGE_DATA_DIR "/system.db") != 0) 1235 if (ecore_config_file_load(PACKAGE_DATA_DIR "/system.db") != 0)
1236 return ECORE_CONFIG_ERR_NOFILE; 1236 return ECORE_CONFIG_ERR_NOFILE;
1237 sys = __ecore_config_bundle_local->data; 1237 sys = __ecore_config_bundle_local->data;
1238 while (sys) 1238 while (sys)
diff --git a/legacy/ecore/src/lib/ecore_config/edb.c b/legacy/ecore/src/lib/ecore_config/edb.c
index b4e1f7f91f..22a637fe74 100644
--- a/legacy/ecore/src/lib/ecore_config/edb.c
+++ b/legacy/ecore/src/lib/ecore_config/edb.c
@@ -22,7 +22,7 @@ ecore_config_load(void)
22 22
23 snprintf(file, PATH_MAX, "%s/.e/apps/%s/config.db", getenv("HOME"), 23 snprintf(file, PATH_MAX, "%s/.e/apps/%s/config.db", getenv("HOME"),
24 __ecore_config_app_name); 24 __ecore_config_app_name);
25 return ecore_config_load_file(file); 25 return ecore_config_file_load(file);
26} 26}
27 27
28/** 28/**
@@ -37,7 +37,7 @@ ecore_config_save(void)
37 37
38 snprintf(file, PATH_MAX, "%s/.e/apps/%s/config.db", getenv("HOME"), 38 snprintf(file, PATH_MAX, "%s/.e/apps/%s/config.db", getenv("HOME"),
39 __ecore_config_app_name); 39 __ecore_config_app_name);
40 return ecore_config_save_file(file); 40 return ecore_config_file_save(file);
41} 41}
42 42
43/** 43/**
@@ -47,7 +47,7 @@ ecore_config_save(void)
47 * returned if the file cannot be loaded. 47 * returned if the file cannot be loaded.
48 */ 48 */
49int 49int
50ecore_config_load_file(char *file) 50ecore_config_file_load(char *file)
51{ 51{
52 E_DB_File *db; 52 E_DB_File *db;
53 char **keys; 53 char **keys;
@@ -81,7 +81,7 @@ ecore_config_load_file(char *file)
81 { 81 {
82 if (e_db_int_get(db, keys[x], &itmp)) 82 if (e_db_int_get(db, keys[x], &itmp))
83 { 83 {
84 ecore_config_set_int(keys[x], itmp); 84 ecore_config_int_set(keys[x], itmp);
85 } 85 }
86 else 86 else
87 { 87 {
@@ -92,7 +92,7 @@ ecore_config_load_file(char *file)
92 { 92 {
93 if (e_db_float_get(db, keys[x], &ftmp)) 93 if (e_db_float_get(db, keys[x], &ftmp))
94 { 94 {
95 ecore_config_set_float(keys[x], ftmp); 95 ecore_config_float_set(keys[x], ftmp);
96 } 96 }
97 else 97 else
98 { 98 {
@@ -104,17 +104,17 @@ ecore_config_load_file(char *file)
104 data = e_db_str_get(db, keys[x]); 104 data = e_db_str_get(db, keys[x]);
105 if (data) 105 if (data)
106 { 106 {
107 itmp = ecore_config_guess_type(keys[x], data); 107 itmp = ecore_config_type_guess(keys[x], data);
108 switch (itmp) 108 switch (itmp)
109 { 109 {
110 case PT_RGB: 110 case PT_RGB:
111 ecore_config_set_rgb(keys[x], data); 111 ecore_config_rgb_set(keys[x], data);
112 break; 112 break;
113 case PT_THM: 113 case PT_THM:
114 ecore_config_set_theme(keys[x], data); 114 ecore_config_theme_set(keys[x], data);
115 break; 115 break;
116 default: 116 default:
117 ecore_config_set_string(keys[x], data); 117 ecore_config_string_set(keys[x], data);
118 } 118 }
119 free(data); 119 free(data);
120 } 120 }
@@ -165,7 +165,7 @@ _ecore_config_recurse_mkdir(char *file)
165 * ECORE_CONFIG_ERR_FAIL is returned if the data cannot be saved. 165 * ECORE_CONFIG_ERR_FAIL is returned if the data cannot be saved.
166 */ 166 */
167int 167int
168ecore_config_save_file(char *file) 168ecore_config_file_save(char *file)
169{ 169{
170 Ecore_Config_Prop *next; 170 Ecore_Config_Prop *next;
171 E_DB_File *db; 171 E_DB_File *db;
@@ -195,19 +195,19 @@ ecore_config_save_file(char *file)
195 switch (next->type) 195 switch (next->type)
196 { 196 {
197 case PT_INT: 197 case PT_INT:
198 e_db_int_set(db, next->key, ecore_config_get_int(next->key)); 198 e_db_int_set(db, next->key, ecore_config_int_get(next->key));
199 break; 199 break;
200 case PT_FLT: 200 case PT_FLT:
201 e_db_float_set(db, next->key, ecore_config_get_float(next->key)); 201 e_db_float_set(db, next->key, ecore_config_float_get(next->key));
202 break; 202 break;
203 case PT_RGB: 203 case PT_RGB:
204 e_db_str_set(db, next->key, ecore_config_get_rgbstr(next->key)); 204 e_db_str_set(db, next->key, ecore_config_rgbstr_get(next->key));
205 break; 205 break;
206 case PT_STR: 206 case PT_STR:
207 e_db_str_set(db, next->key, ecore_config_get_string(next->key)); 207 e_db_str_set(db, next->key, ecore_config_string_get(next->key));
208 break; 208 break;
209 case PT_THM: 209 case PT_THM:
210 e_db_str_set(db, next->key, ecore_config_get_theme(next->key)); 210 e_db_str_set(db, next->key, ecore_config_theme_get(next->key));
211 break; 211 break;
212 case PT_NIL: 212 case PT_NIL:
213 /* currently we do nothing for undefined ojects */ 213 /* currently we do nothing for undefined ojects */
diff --git a/legacy/ecore/src/lib/ecore_config/ipc_ecore.c b/legacy/ecore/src/lib/ecore_config/ipc_ecore.c
index c56ce259fb..955e0c2f40 100644
--- a/legacy/ecore/src/lib/ecore_config/ipc_ecore.c
+++ b/legacy/ecore/src/lib/ecore_config/ipc_ecore.c
@@ -24,7 +24,7 @@
24/*****************************************************************************/ 24/*****************************************************************************/
25 25
26static int 26static int
27_ecore_config_ipc_ecore_get_string(char **m, char **r) 27_ecore_config_ipc_ecore_string_get(char **m, char **r)
28{ 28{
29 char *q; 29 char *q;
30 int l = 0; 30 int l = 0;
@@ -88,7 +88,7 @@ _ecore_config_ipc_global_prop_list(Ecore_Config_Server * srv, const long serial)
88 data = e_db_str_get(db, keys[x]); 88 data = e_db_str_get(db, keys[x]);
89 if (data) 89 if (data)
90 { 90 {
91 if (ecore_config_guess_type(keys[x], data) == PT_RGB) 91 if (ecore_config_type_guess(keys[x], data) == PT_RGB)
92 estring_appendf(s, "%s%s: colour", f ? "\n" : "", keys[x]); 92 estring_appendf(s, "%s%s: colour", f ? "\n" : "", keys[x]);
93 else 93 else
94 estring_appendf(s, "%s%s: string", f ? "\n" : "", keys[x]); 94 estring_appendf(s, "%s%s: string", f ? "\n" : "", keys[x]);
@@ -156,17 +156,17 @@ _ecore_config_ipc_ecore_handle_request(Ecore_Ipc_Server * server,
156 r = _ecore_config_ipc_prop_list(srv, serial); 156 r = _ecore_config_ipc_prop_list(srv, serial);
157 break; 157 break;
158 case IPC_PROP_DESC: 158 case IPC_PROP_DESC:
159 if (_ecore_config_ipc_ecore_get_string(&m, &k) == ECORE_CONFIG_ERR_SUCC) 159 if (_ecore_config_ipc_ecore_string_get(&m, &k) == ECORE_CONFIG_ERR_SUCC)
160 r = _ecore_config_ipc_prop_desc(srv, serial, k); 160 r = _ecore_config_ipc_prop_desc(srv, serial, k);
161 break; 161 break;
162 case IPC_PROP_GET: 162 case IPC_PROP_GET:
163 if (_ecore_config_ipc_ecore_get_string(&m, &k) == ECORE_CONFIG_ERR_SUCC) 163 if (_ecore_config_ipc_ecore_string_get(&m, &k) == ECORE_CONFIG_ERR_SUCC)
164 r = _ecore_config_ipc_prop_get(srv, serial, k); 164 r = _ecore_config_ipc_prop_get(srv, serial, k);
165 break; 165 break;
166 case IPC_PROP_SET: 166 case IPC_PROP_SET:
167 if (_ecore_config_ipc_ecore_get_string(&m, &k) == ECORE_CONFIG_ERR_SUCC) 167 if (_ecore_config_ipc_ecore_string_get(&m, &k) == ECORE_CONFIG_ERR_SUCC)
168 { 168 {
169 if (_ecore_config_ipc_ecore_get_string(&m, &v) == 169 if (_ecore_config_ipc_ecore_string_get(&m, &v) ==
170 ECORE_CONFIG_ERR_SUCC) 170 ECORE_CONFIG_ERR_SUCC)
171 return _ecore_config_ipc_ecore_send(e, 171 return _ecore_config_ipc_ecore_send(e,
172 _ecore_config_ipc_prop_set 172 _ecore_config_ipc_prop_set
@@ -178,7 +178,7 @@ _ecore_config_ipc_ecore_handle_request(Ecore_Ipc_Server * server,
178 r = _ecore_config_ipc_bundle_list(srv); 178 r = _ecore_config_ipc_bundle_list(srv);
179 break; 179 break;
180 case IPC_BUNDLE_NEW: 180 case IPC_BUNDLE_NEW:
181 if (_ecore_config_ipc_ecore_get_string(&m, &k) == ECORE_CONFIG_ERR_SUCC) 181 if (_ecore_config_ipc_ecore_string_get(&m, &k) == ECORE_CONFIG_ERR_SUCC)
182 return _ecore_config_ipc_ecore_send(e, 182 return _ecore_config_ipc_ecore_send(e,
183 k ? 183 k ?
184 _ecore_config_ipc_bundle_new(srv, 184 _ecore_config_ipc_bundle_new(srv,
@@ -186,7 +186,7 @@ _ecore_config_ipc_ecore_handle_request(Ecore_Ipc_Server * server,
186 ECORE_CONFIG_ERR_FAIL, NULL); 186 ECORE_CONFIG_ERR_FAIL, NULL);
187 break; 187 break;
188 case IPC_BUNDLE_LABEL_SET: 188 case IPC_BUNDLE_LABEL_SET:
189 if (_ecore_config_ipc_ecore_get_string(&m, &k) == ECORE_CONFIG_ERR_SUCC) 189 if (_ecore_config_ipc_ecore_string_get(&m, &k) == ECORE_CONFIG_ERR_SUCC)
190 return _ecore_config_ipc_ecore_send(e, 190 return _ecore_config_ipc_ecore_send(e,
191 k ? 191 k ?
192 _ecore_config_ipc_bundle_label_set 192 _ecore_config_ipc_bundle_label_set
@@ -195,7 +195,7 @@ _ecore_config_ipc_ecore_handle_request(Ecore_Ipc_Server * server,
195 NULL); 195 NULL);
196 break; 196 break;
197 case IPC_BUNDLE_LABEL_FIND: 197 case IPC_BUNDLE_LABEL_FIND:
198 if (_ecore_config_ipc_ecore_get_string(&m, &k) == ECORE_CONFIG_ERR_SUCC) 198 if (_ecore_config_ipc_ecore_string_get(&m, &k) == ECORE_CONFIG_ERR_SUCC)
199 return _ecore_config_ipc_ecore_send(e, 199 return _ecore_config_ipc_ecore_send(e,
200 _ecore_config_ipc_bundle_label_find 200 _ecore_config_ipc_bundle_label_find
201 (srv, k), NULL); 201 (srv, k), NULL);
diff --git a/legacy/ecore/src/lib/ecore_config/ipc_main.c b/legacy/ecore/src/lib/ecore_config/ipc_main.c
index 3bccef2dc4..17ef3116b2 100644
--- a/legacy/ecore/src/lib/ecore_config/ipc_main.c
+++ b/legacy/ecore/src/lib/ecore_config/ipc_main.c
@@ -67,7 +67,7 @@ _ecore_config_ipc_prop_list(Ecore_Config_Server * srv, const long serial)
67 estring *s; 67 estring *s;
68 int f; 68 int f;
69 69
70 theme = ecore_config_bundle_get_by_serial(srv, serial); 70 theme = ecore_config_bundle_by_serial_get(srv, serial);
71 e = theme ? theme->data : NULL; 71 e = theme ? theme->data : NULL;
72 s = estring_new(8192); 72 s = estring_new(8192);
73 f = 0; 73 f = 0;
@@ -80,7 +80,7 @@ _ecore_config_ipc_prop_list(Ecore_Config_Server * srv, const long serial)
80 continue; 80 continue;
81 } 81 }
82 estring_appendf(s, "%s%s: %s", f ? "\n" : "", e->key, 82 estring_appendf(s, "%s%s: %s", f ? "\n" : "", e->key,
83 ecore_config_get_type(e)); 83 ecore_config_type_get(e));
84 if (e->flags & PF_BOUNDS) 84 if (e->flags & PF_BOUNDS)
85 { 85 {
86 if (e->type == PT_FLT) 86 if (e->type == PT_FLT)
@@ -107,14 +107,14 @@ _ecore_config_ipc_prop_desc(Ecore_Config_Server * srv, const long serial,
107 Ecore_Config_Bundle *theme; 107 Ecore_Config_Bundle *theme;
108 Ecore_Config_Prop *e; 108 Ecore_Config_Prop *e;
109 109
110 theme = ecore_config_bundle_get_by_serial(srv, serial); 110 theme = ecore_config_bundle_by_serial_get(srv, serial);
111 e = ecore_config_get(key); 111 e = ecore_config_get(key);
112 112
113 if (e) 113 if (e)
114 { 114 {
115 estring *s = estring_new(512); 115 estring *s = estring_new(512);
116 116
117 estring_appendf(s, "%s: %s", e->key, ecore_config_get_type(e)); 117 estring_appendf(s, "%s: %s", e->key, ecore_config_type_get(e));
118 if (e->flags & PF_BOUNDS) 118 if (e->flags & PF_BOUNDS)
119 estring_appendf(s, ", range %d..%d", e->lo, e->hi); 119 estring_appendf(s, ", range %d..%d", e->lo, e->hi);
120 return estring_disown(s); 120 return estring_disown(s);
@@ -132,8 +132,8 @@ _ecore_config_ipc_prop_get(Ecore_Config_Server * srv, const long serial,
132 Ecore_Config_Bundle *theme; 132 Ecore_Config_Bundle *theme;
133 133
134 ret = NULL; 134 ret = NULL;
135 theme = ecore_config_bundle_get_by_serial(srv, serial); 135 theme = ecore_config_bundle_by_serial_get(srv, serial);
136 if ((ret = ecore_config_get_as_string( /*theme, */ key))) 136 if ((ret = ecore_config_as_string_get( /*theme, */ key)))
137 return ret; 137 return ret;
138#endif 138#endif
139 return strdup("<undefined>"); 139 return strdup("<undefined>");
@@ -147,7 +147,7 @@ _ecore_config_ipc_prop_set(Ecore_Config_Server * srv, const long serial,
147 int ret; 147 int ret;
148 Ecore_Config_Bundle *theme; 148 Ecore_Config_Bundle *theme;
149 149
150 theme = ecore_config_bundle_get_by_serial(srv, serial); 150 theme = ecore_config_bundle_by_serial_get(srv, serial);
151 ret = ecore_config_set(key, (char *)val); 151 ret = ecore_config_set(key, (char *)val);
152 E(1, "ipc.prop.set(%s->%s,\"%s\") => %d\n", theme ? theme->identifier : "", 152 E(1, "ipc.prop.set(%s->%s,\"%s\") => %d\n", theme ? theme->identifier : "",
153 key, val, ret); 153 key, val, ret);
@@ -166,7 +166,7 @@ _ecore_config_ipc_bundle_list(Ecore_Config_Server * srv)
166 estring *s; 166 estring *s;
167 int f; 167 int f;
168 168
169 ns = ecore_config_bundle_get_1st(srv); 169 ns = ecore_config_bundle_1st_get(srv);
170 s = estring_new(8192); 170 s = estring_new(8192);
171 f = 0; 171 f = 0;
172 if (!ns) 172 if (!ns)
@@ -175,10 +175,10 @@ _ecore_config_ipc_bundle_list(Ecore_Config_Server * srv)
175 while (ns) 175 while (ns)
176 { 176 {
177 estring_appendf(s, "%s%d: %s", f ? "\n" : "", 177 estring_appendf(s, "%s%d: %s", f ? "\n" : "",
178 ecore_config_bundle_get_serial(ns), 178 ecore_config_bundle_serial_get(ns),
179 ecore_config_bundle_get_label(ns)); 179 ecore_config_bundle_label_get(ns));
180 f = 1; 180 f = 1;
181 ns = ecore_config_bundle_get_next(ns); 181 ns = ecore_config_bundle_next_get(ns);
182 } 182 }
183 183
184 return estring_disown(s); 184 return estring_disown(s);
@@ -198,8 +198,8 @@ _ecore_config_ipc_bundle_label_get(Ecore_Config_Server * srv, const long serial)
198 Ecore_Config_Bundle *ns; 198 Ecore_Config_Bundle *ns;
199 char *label; 199 char *label;
200 200
201 ns = ecore_config_bundle_get_by_serial(srv, serial); 201 ns = ecore_config_bundle_by_serial_get(srv, serial);
202 label = ecore_config_bundle_get_label(ns); 202 label = ecore_config_bundle_label_get(ns);
203 return strdup(label ? label : "<no such bundle>"); 203 return strdup(label ? label : "<no such bundle>");
204} 204}
205 205
@@ -209,7 +209,7 @@ _ecore_config_ipc_bundle_label_set(Ecore_Config_Server * srv, const long serial,
209{ 209{
210 Ecore_Config_Bundle *ns; 210 Ecore_Config_Bundle *ns;
211 211
212 ns = ecore_config_bundle_get_by_serial(srv, serial); 212 ns = ecore_config_bundle_by_serial_get(srv, serial);
213 if (!(ns->identifier = malloc(sizeof(label)))) 213 if (!(ns->identifier = malloc(sizeof(label))))
214 return ECORE_CONFIG_ERR_OOM; 214 return ECORE_CONFIG_ERR_OOM;
215 memcpy(ns->identifier, label, sizeof(label)); 215 memcpy(ns->identifier, label, sizeof(label));
@@ -222,8 +222,8 @@ _ecore_config_ipc_bundle_label_find(Ecore_Config_Server * srv,
222{ 222{
223 Ecore_Config_Bundle *ns; 223 Ecore_Config_Bundle *ns;
224 224
225 ns = ecore_config_bundle_get_by_label(srv, label); 225 ns = ecore_config_bundle_by_label_get(srv, label);
226 return ns ? ecore_config_bundle_get_serial(ns) : -1; 226 return ns ? ecore_config_bundle_serial_get(ns) : -1;
227} 227}
228 228
229static int 229static int