kikadf
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

combine some if{} blocks to remove a possibility of passing garbage value to e_widget_ilist_nth_label_set 

SVN revision: 55733
This commit is contained in:
Mike Blumenkrantz 2010-12-23 01:02:42 +00:00
parent 18a3bc72ef
commit f3a0638cf7
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/conf_keybindings/e_int_config_keybindings.c
View File

@ -1103,19 +1103,7 @@ _grab_key_down_cb(void *data,
bi->any_mod = 0; bi->any_mod = 0;
cfdata->binding.key = eina_list_append(cfdata->binding.key, bi); cfdata->binding.key = eina_list_append(cfdata->binding.key, bi);
}
else if (cfdata->locals.cur && cfdata->locals.cur[0])
{
sscanf(cfdata->locals.cur, "k%d", &n);
bi = eina_list_nth(cfdata->binding.key, n);
bi->modifiers = mod;
if (bi->key) eina_stringshare_del(bi->key);
bi->key = eina_stringshare_add(ev->keyname);
}
if (cfdata->locals.add)
{
n = _update_key_binding_list(cfdata, bi); n = _update_key_binding_list(cfdata, bi);
e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n); e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n);
@ -1134,16 +1122,22 @@ _grab_key_down_cb(void *data,
e_widget_entry_text_set(cfdata->gui.o_params, cfdata->params); e_widget_entry_text_set(cfdata->gui.o_params, cfdata->params);
} }
} }
else else
{ {
e_widget_entry_clear(cfdata->gui.o_params); e_widget_entry_clear(cfdata->gui.o_params);
e_widget_disabled_set(cfdata->gui.o_params, 1); e_widget_disabled_set(cfdata->gui.o_params, 1);
} }
} }
else else if (cfdata->locals.cur && cfdata->locals.cur[0])
{ {
printf("blub\n");
char *label; char *label;
sscanf(cfdata->locals.cur, "k%d", &n);
bi = eina_list_nth(cfdata->binding.key, n);
bi->modifiers = mod;
if (bi->key) eina_stringshare_del(bi->key);
bi->key = eina_stringshare_add(ev->keyname);
printf("blub\n");
label = _key_binding_text_get(bi); label = _key_binding_text_get(bi);
e_widget_ilist_nth_label_set(cfdata->gui.o_binding_list, n, label); e_widget_ilist_nth_label_set(cfdata->gui.o_binding_list, n, label);