diff options
Diffstat (limited to 'apps/gui/skin_engine/skin_parser.c')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 59c7e92d90..adac487e27 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -620,13 +620,8 @@ static int parse_setting_and_lang(struct skin_element *element, | |||
620 | } | 620 | } |
621 | else | 621 | else |
622 | { | 622 | { |
623 | /* Find the setting */ | ||
624 | for (i=0; i<nb_settings; i++) | ||
625 | if (settings[i].cfg_name && | ||
626 | !strcmp(settings[i].cfg_name, temp)) | ||
627 | break; | ||
628 | #ifndef __PCTOOL__ | 623 | #ifndef __PCTOOL__ |
629 | if (i == nb_settings) | 624 | if (find_setting_by_cfgname(temp, &i) == NULL) |
630 | return WPS_ERROR_INVALID_PARAM; | 625 | return WPS_ERROR_INVALID_PARAM; |
631 | #endif | 626 | #endif |
632 | } | 627 | } |
@@ -1148,14 +1143,10 @@ static int touchregion_setup_setting(struct skin_element *element, int param_no, | |||
1148 | int p = param_no; | 1143 | int p = param_no; |
1149 | char *name = element->params[p++].data.text; | 1144 | char *name = element->params[p++].data.text; |
1150 | int j; | 1145 | int j; |
1151 | /* Find the setting */ | 1146 | |
1152 | for (j=0; j<nb_settings; j++) | 1147 | region->setting_data.setting = find_setting_by_cfgname(name, &j); |
1153 | if (settings[j].cfg_name && | 1148 | if (region->setting_data.setting == NULL) |
1154 | !strcmp(settings[j].cfg_name, name)) | ||
1155 | break; | ||
1156 | if (j==nb_settings) | ||
1157 | return WPS_ERROR_INVALID_PARAM; | 1149 | return WPS_ERROR_INVALID_PARAM; |
1158 | region->setting_data.setting = (void*)&settings[j]; | ||
1159 | if (region->action == ACTION_SETTINGS_SET) | 1150 | if (region->action == ACTION_SETTINGS_SET) |
1160 | { | 1151 | { |
1161 | char* text; | 1152 | char* text; |