Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/examine
Dir : e17/apps/examine/src
Modified Files:
examine.c examine_client.c
Log Message:
Oops, update to ecore_config changes - thanks Dan
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/examine/src/examine.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- examine.c 6 Sep 2005 01:50:16 -0000 1.32
+++ examine.c 18 Sep 2005 20:13:34 -0000 1.33
@@ -262,11 +262,11 @@
}
free(key_tmp);
- if (prop_item->type == PT_STR) {
+ if (prop_item->type == ECORE_CONFIG_STR) {
entries[1] = ewl_entry_new("");
ewl_callback_append(entries[1], EWL_CALLBACK_DESELECT, cb_set_str,
prop_item);
- } else if (prop_item->type == PT_INT) {
+ } else if (prop_item->type == ECORE_CONFIG_INT) {
entries[1] = ewl_spinner_new();
ewl_spinner_digits_set(EWL_SPINNER(entries[1]), 0);
@@ -279,7 +279,7 @@
ewl_spinner_step_set(EWL_SPINNER(entries[1]), prop_item->step);
ewl_callback_append(entries[1], EWL_CALLBACK_VALUE_CHANGED, cb_set_int,
prop_item);
- } else if (prop_item->type == PT_FLT) {
+ } else if (prop_item->type == ECORE_CONFIG_FLT) {
entries[1] = ewl_spinner_new();
/* ewl_spinner_digits_set(EWL_SPINNER(input), 0);
@@ -292,12 +292,12 @@
ewl_spinner_step_set(EWL_SPINNER(entries[1]), prop_item->fstep);
ewl_callback_append(entries[1], EWL_CALLBACK_VALUE_CHANGED, cb_set_float,
prop_item);
- } else if (prop_item->type == PT_RGB) {
+ } else if (prop_item->type == ECORE_CONFIG_RGB) {
entries[1] = ewl_entry_new("");
ewl_callback_append(entries[1], EWL_CALLBACK_DESELECT, cb_set_str,
prop_item);
- } else if (prop_item->type == PT_THM) {
+ } else if (prop_item->type == ECORE_CONFIG_THM) {
struct stat st;
struct dirent *next;
DIR *dp;
@@ -391,7 +391,7 @@
free(search_path);
ecore_list_destroy(themes);
- } else if (prop_item->type == PT_BLN) {
+ } else if (prop_item->type == ECORE_CONFIG_BLN) {
entries[1] = ewl_checkbutton_new("");
ewl_callback_append(entries[1],
EWL_CALLBACK_VALUE_CHANGED, cb_set_bln, prop_item);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/examine/src/examine_client.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- examine_client.c 6 Sep 2005 01:50:16 -0000 1.27
+++ examine_client.c 18 Sep 2005 20:13:34 -0000 1.28
@@ -278,9 +278,9 @@
range[strlen(range) - 1] = '\0';
if (!strcmp(type, "string")) {
- prop_tmp->type = PT_STR;
+ prop_tmp->type = ECORE_CONFIG_STR;
} else if (!strcmp(type, "integer")) {
- prop_tmp->type = PT_INT;
+ prop_tmp->type = ECORE_CONFIG_INT;
if (*range) {
prop_tmp->bound |= BOUND_BOUND;
sscanf(range, "%d..%d", &mini, &maxi);
@@ -293,7 +293,7 @@
prop_tmp->step = tmpi;
}
} else if (!strcmp(type, "float")) {
- prop_tmp->type = PT_FLT;
+ prop_tmp->type = ECORE_CONFIG_FLT;
if (*range) {
prop_tmp->bound |= BOUND_BOUND;
sscanf(range, "%f..%f", &mind, &maxd);
@@ -306,14 +306,14 @@
prop_tmp->fstep = tmpd;
}
} else if (!strcmp(type, "colour")) {
- prop_tmp->type = PT_RGB;
+ prop_tmp->type = ECORE_CONFIG_RGB;
} else if (!strcmp(type, "theme")) {
- prop_tmp->type = PT_THM;
+ prop_tmp->type = ECORE_CONFIG_THM;
prop_tmp->data = strdup(range);
} else if (!strcmp(type, "boolean")) {
- prop_tmp->type = PT_BLN;
+ prop_tmp->type = ECORE_CONFIG_BLN;
} else {
- prop_tmp->type = PT_NIL;
+ prop_tmp->type = ECORE_CONFIG_NIL;
prop_tmp->value.ptr = prop_tmp->oldvalue.ptr = NULL; }
prop_tmp->next = prop_list;
@@ -347,19 +347,19 @@
char *bugfix;
Ewl_Widget *sibling;
switch (target->type) {
- case PT_INT:
+ case ECORE_CONFIG_INT:
target->value.val = target->oldvalue.val;
ewl_spinner_value_set(EWL_SPINNER(target->w), target->value.val);
break;
- case PT_BLN:
+ case ECORE_CONFIG_BLN:
target->value.val = target->oldvalue.val;
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(target->w), target->value.val);
break;
- case PT_FLT:
+ case ECORE_CONFIG_FLT:
target->value.fval = target->oldvalue.fval;
ewl_spinner_value_set(EWL_SPINNER(target->w), target->value.fval);
break;
- case PT_THM:
+ case ECORE_CONFIG_THM:
free(target->value.ptr);
target->value.ptr = strdup(target->oldvalue.ptr);
@@ -374,9 +374,9 @@
ewl_text_text_set(EWL_TEXT(sibling), bugfix);
}
break;
- case PT_NIL:
+ case ECORE_CONFIG_NIL:
break;
- default: /* PT_STR, PT_RGB */
+ default: /* ECORE_CONFIG_STR, ECORE_CONFIG_RGB */
free(target->value.ptr);
target->value.ptr = strdup(target->oldvalue.ptr);
ewl_text_text_set(EWL_TEXT(target->w), target->value.ptr);
@@ -399,20 +399,20 @@
examine_client_save(examine_prop * target)
{
switch (target->type) {
- case PT_INT:
- case PT_BLN:
+ case ECORE_CONFIG_INT:
+ case ECORE_CONFIG_BLN:
if (target->value.val != target->oldvalue.val) {
target->oldvalue.val = target->value.val;
examine_client_set_val(target);
}
break;
- case PT_FLT:
+ case ECORE_CONFIG_FLT:
if (target->value.fval != target->oldvalue.fval) {
target->oldvalue.fval = target->value.fval;
examine_client_set_val(target);
}
break;
- default: /* PT_STR, PT_RGB */
+ default: /* ECORE_CONFIG_STR, ECORE_CONFIG_RGB */
#if 0
printf("$%x, %s, %p,
%p\n",target->type,target->key,target->value.ptr,target->oldvalue.ptr);
if(target->value.ptr)
@@ -485,19 +485,19 @@
return;
switch (prop->type) {
- case PT_INT:
+ case ECORE_CONFIG_INT:
sscanf(ret, "%d", &tmpi);
prop->value.val = tmpi;
prop->oldvalue.val = tmpi;
ewl_spinner_value_set(EWL_SPINNER(prop->w), (double) tmpi);
break;
- case PT_FLT:
+ case ECORE_CONFIG_FLT:
sscanf(ret, "%f", &tmpd);
prop->value.fval = tmpd;
prop->oldvalue.fval = tmpd;
ewl_spinner_value_set(EWL_SPINNER(prop->w), tmpd);
break;
- case PT_THM:
+ case ECORE_CONFIG_THM:
prop->value.ptr = strdup(ret);
prop->oldvalue.ptr = strdup(ret);
@@ -512,13 +512,13 @@
ewl_text_text_set(EWL_TEXT(sibling), bugfix);
}
break;
- case PT_BLN:
+ case ECORE_CONFIG_BLN:
sscanf(ret, "%d", &tmpi);
prop->value.val = tmpi ? 1 : 0;
prop->oldvalue.val = tmpi;
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(prop->w), tmpi);
break;
- default: /* PT_STR, PT_RGB */
+ default: /* ECORE_CONFIG_STR, ECORE_CONFIG_RGB */
prop->value.ptr = strdup(ret);
prop->oldvalue.ptr = strdup(ret);
ewl_text_text_set(EWL_TEXT(prop->w), ret);
@@ -534,16 +534,16 @@
c = find_call("prop-set");
switch (target->type) {
- case PT_INT:
- case PT_BLN:
+ case ECORE_CONFIG_INT:
+ case ECORE_CONFIG_BLN:
valstr = malloc(1000); /* ### FIXME */
snprintf(valstr, sizeof(valstr)-1, "%ld", target->value.val);
break;
- case PT_FLT:
+ case ECORE_CONFIG_FLT:
valstr = malloc(1000); /* ### FIXME */
snprintf(valstr, sizeof(valstr)-1, "%f", target->value.fval);
break;
- default: /* PT_STR, PT_RGB */
+ default: /* ECORE_CONFIG_STR, ECORE_CONFIG_RGB */
valstr = target->value.ptr;
}
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
