summaryrefslogtreecommitdiff
path: root/src/modules/conf_keybindings/e_int_config_acpibindings.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-01 10:21:54 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-01 10:21:54 +0000
commitc48fd0b06d22c47228005b0639aad580350bdf26 (patch)
tree135a9937068791da3c69d50969241008300eb1f7 /src/modules/conf_keybindings/e_int_config_acpibindings.c
parentabe45b31c1ca503970b87f657397dcc3bce35af6 (diff)
giant commit that wipes all bindi^W^W^Wsplits out binding configs into a separate config domain so they can be more easily copied and so they won't be wiped in the event that primary config is wiped
also splits all binding lists out of e_config: they are now conveniently located in the global "e_bindings" struct SVN revision: 83544
Diffstat (limited to 'src/modules/conf_keybindings/e_int_config_acpibindings.c')
-rw-r--r--src/modules/conf_keybindings/e_int_config_acpibindings.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/conf_keybindings/e_int_config_acpibindings.c b/src/modules/conf_keybindings/e_int_config_acpibindings.c
index 64d8cce8c..416c518cf 100644
--- a/src/modules/conf_keybindings/e_int_config_acpibindings.c
+++ b/src/modules/conf_keybindings/e_int_config_acpibindings.c
@@ -94,7 +94,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
94 Eina_List *l; 94 Eina_List *l;
95 E_Config_Binding_Acpi *binding; 95 E_Config_Binding_Acpi *binding;
96 96
97 EINA_LIST_FOREACH(e_config->acpi_bindings, l, binding) 97 EINA_LIST_FOREACH(e_bindings->acpi_bindings, l, binding)
98 { 98 {
99 E_Config_Binding_Acpi *b2; 99 E_Config_Binding_Acpi *b2;
100 100
@@ -150,7 +150,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__,
150 E_Config_Binding_Acpi *binding, *b2; 150 E_Config_Binding_Acpi *binding, *b2;
151 Eina_List *l; 151 Eina_List *l;
152 152
153 EINA_LIST_FREE(e_config->acpi_bindings, binding) 153 EINA_LIST_FREE(e_bindings->acpi_bindings, binding)
154 { 154 {
155 e_bindings_acpi_del(binding->context, binding->type, binding->status, 155 e_bindings_acpi_del(binding->context, binding->type, binding->status,
156 binding->action, binding->params); 156 binding->action, binding->params);
@@ -167,8 +167,8 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__,
167 b2->status = binding->status; 167 b2->status = binding->status;
168 b2->action = eina_stringshare_ref(binding->action); 168 b2->action = eina_stringshare_ref(binding->action);
169 b2->params = eina_stringshare_ref(binding->params); 169 b2->params = eina_stringshare_ref(binding->params);
170 e_config->acpi_bindings = 170 e_bindings->acpi_bindings =
171 eina_list_append(e_config->acpi_bindings, b2); 171 eina_list_append(e_bindings->acpi_bindings, b2);
172 172
173 e_bindings_acpi_add(b2->context, b2->type, b2->status, 173 e_bindings_acpi_add(b2->context, b2->type, b2->status,
174 b2->action, b2->params); 174 b2->action, b2->params);
@@ -535,7 +535,7 @@ _cb_del_binding(void *data,
535 if (!(binding = _selected_binding_get(cfdata))) return; 535 if (!(binding = _selected_binding_get(cfdata))) return;
536 536
537 /* delete from e_config */ 537 /* delete from e_config */
538 EINA_LIST_FOREACH(e_config->acpi_bindings, l, bind2) 538 EINA_LIST_FOREACH(e_bindings->acpi_bindings, l, bind2)
539 { 539 {
540 if ((binding->context == bind2->context) && (binding->type == bind2->type) && 540 if ((binding->context == bind2->context) && (binding->type == bind2->type) &&
541 (((binding->action) && (bind2->action) && 541 (((binding->action) && (bind2->action) &&
@@ -548,8 +548,8 @@ _cb_del_binding(void *data,
548 if (bind2->action) eina_stringshare_del(bind2->action); 548 if (bind2->action) eina_stringshare_del(bind2->action);
549 if (bind2->params) eina_stringshare_del(bind2->params); 549 if (bind2->params) eina_stringshare_del(bind2->params);
550 E_FREE(bind2); 550 E_FREE(bind2);
551 e_config->acpi_bindings = 551 e_bindings->acpi_bindings =
552 eina_list_remove_list(e_config->acpi_bindings, l); 552 eina_list_remove_list(e_bindings->acpi_bindings, l);
553 e_config_save_queue(); 553 e_config_save_queue();
554 break; 554 break;
555 } 555 }