this patch changes elicit to take advantage of the new, improved, argb
functions in ecore_config
Cheers,
--
Morten
:wq
Index: conf.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/conf.c,v
retrieving revision 1.13
diff -u -r1.13 conf.c
--- conf.c 30 Dec 2005 02:51:08 -0000 1.13
+++ conf.c 2 Jan 2006 06:15:23 -0000
@@ -17,16 +17,12 @@
void
elicit_config_load()
{
- ecore_config_int_default("/color/r", 255);
- ecore_config_int_default("/color/g", 255);
- ecore_config_int_default("/color/b", 255);
+ ecore_config_argb_default("/color", 255, 255, 255, 255);
ecore_config_float_default("/settings/zoom", 4.0);
ecore_config_float_default("/settings/zoom_max", 20.0);
ecore_config_theme_default("/settings/theme", "winter");
ecore_config_theme_preview_group_set("/settings/theme", "elicit");
- ecore_config_int_default("/colorclass/r", 229);
- ecore_config_int_default("/colorclass/g", 239);
- ecore_config_int_default("/colorclass/b", 255);
+ ecore_config_argb_default("/colorclass", 255, 229, 239, 255);
ecore_config_string_default("/editor", "gimp-remote");
ecore_config_load();
}
@@ -47,8 +43,7 @@
char *
elicit_config_theme_get()
{
- char *theme = ecore_config_theme_get("/settings/theme");
- return theme;
+ return ecore_config_theme_get("/settings/theme");
}
void
@@ -91,33 +86,25 @@
void
elicit_config_color_get(int *r, int *g, int *b)
{
- if (r) *r = ecore_config_int_get("/color/r");
- if (g) *g = ecore_config_int_get("/color/g");
- if (b) *b = ecore_config_int_get("/color/b");
+ ecore_config_argb_get("/color", NULL, r, g, b);
}
void
elicit_config_color_set(int r, int g, int b)
{
- ecore_config_int_set("/color/r", r);
- ecore_config_int_set("/color/g", g);
- ecore_config_int_set("/color/b", b);
+ ecore_conofig_argb_set("/color", 255, r, g, b);
}
void
elicit_config_colorclass_get(int *r, int *g, int *b)
{
- if (r) *r = ecore_config_int_get("/colorclass/r");
- if (g) *g = ecore_config_int_get("/colorclass/g");
- if (b) *b = ecore_config_int_get("/colorclass/b");
+ ecore_config_argb_get("/colorclass", NULL, r, g, b);
}
void
elicit_config_colorclass_set(int r, int g, int b)
{
- ecore_config_int_set("/colorclass/r", r);
- ecore_config_int_set("/colorclass/g", g);
- ecore_config_int_set("/colorclass/b", b);
+ ecore_config_argb_set("/colorclass", 255, r, g, b);
}
char *