summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2014-01-27 11:25:24 -0500
committerMike Blumenkrantz <zmike@samsung.com>2014-01-27 11:30:40 -0500
commit90f8e201f4574e25ce5bc4a470272ef12884ae73 (patch)
treedec157a05638b9035c5b83ad783c6c1cf9d7050a
parentda9be060c90ff712621c1a7279f9222fc95239fb (diff)
bugfix: use config_type to set parent profile when resetting bindings
I added this a long time ago to fix binding resets and forgot to add the support in to binding resets. genius. T642
-rw-r--r--src/modules/conf_bindings/e_int_config_edgebindings.c18
-rw-r--r--src/modules/conf_bindings/e_int_config_keybindings.c18
-rw-r--r--src/modules/conf_bindings/e_int_config_mousebindings.c18
-rw-r--r--src/modules/conf_bindings/e_int_config_signalbindings.c18
4 files changed, 64 insertions, 8 deletions
diff --git a/src/modules/conf_bindings/e_int_config_edgebindings.c b/src/modules/conf_bindings/e_int_config_edgebindings.c
index de3a31c72..6c0abf04b 100644
--- a/src/modules/conf_bindings/e_int_config_edgebindings.c
+++ b/src/modules/conf_bindings/e_int_config_edgebindings.c
@@ -516,9 +516,23 @@ _restore_edge_binding_defaults_cb(void *data, void *data2 __UNUSED__)
516 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings")); 516 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
517 if (!ecb) 517 if (!ecb)
518 { 518 {
519 const char *type;
520
519 prof = eina_stringshare_ref(e_config_profile_get()); 521 prof = eina_stringshare_ref(e_config_profile_get());
520 /* FIXME: need some type of parenting/typing system for profiles */ 522 switch (e_config->config_type)
521 e_config_profile_set("standard"); 523 {
524 case E_CONFIG_PROFILE_TYPE_DESKTOP:
525 type = "standard";
526 break;
527 case E_CONFIG_PROFILE_TYPE_MOBILE:
528 type = "mobile";
529 break;
530 //case E_CONFIG_PROFILE_TYPE_TABLET: FIXME - not used
531 default:
532 type = "default";
533 break;
534 }
535 e_config_profile_set(type);
522 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings")); 536 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
523 e_config_profile_set(prof); 537 e_config_profile_set(prof);
524 eina_stringshare_del(prof); 538 eina_stringshare_del(prof);
diff --git a/src/modules/conf_bindings/e_int_config_keybindings.c b/src/modules/conf_bindings/e_int_config_keybindings.c
index 20541e201..a4c319511 100644
--- a/src/modules/conf_bindings/e_int_config_keybindings.c
+++ b/src/modules/conf_bindings/e_int_config_keybindings.c
@@ -476,9 +476,23 @@ _restore_key_binding_defaults_cb(void *data,
476 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings")); 476 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
477 if (!ecb) 477 if (!ecb)
478 { 478 {
479 const char *type;
480
479 prof = eina_stringshare_ref(e_config_profile_get()); 481 prof = eina_stringshare_ref(e_config_profile_get());
480 /* FIXME: need some type of parenting/typing system for profiles */ 482 switch (e_config->config_type)
481 e_config_profile_set("standard"); 483 {
484 case E_CONFIG_PROFILE_TYPE_DESKTOP:
485 type = "standard";
486 break;
487 case E_CONFIG_PROFILE_TYPE_MOBILE:
488 type = "mobile";
489 break;
490 //case E_CONFIG_PROFILE_TYPE_TABLET: FIXME - not used
491 default:
492 type = "default";
493 break;
494 }
495 e_config_profile_set(type);
482 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings")); 496 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
483 e_config_profile_set(prof); 497 e_config_profile_set(prof);
484 eina_stringshare_del(prof); 498 eina_stringshare_del(prof);
diff --git a/src/modules/conf_bindings/e_int_config_mousebindings.c b/src/modules/conf_bindings/e_int_config_mousebindings.c
index c2e818ba3..cad3e0a28 100644
--- a/src/modules/conf_bindings/e_int_config_mousebindings.c
+++ b/src/modules/conf_bindings/e_int_config_mousebindings.c
@@ -576,9 +576,23 @@ _restore_mouse_binding_defaults_cb(void *data, void *data2 __UNUSED__)
576 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings")); 576 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
577 if (!ecb) 577 if (!ecb)
578 { 578 {
579 const char *type;
580
579 prof = eina_stringshare_ref(e_config_profile_get()); 581 prof = eina_stringshare_ref(e_config_profile_get());
580 /* FIXME: need some type of parenting/typing system for profiles */ 582 switch (e_config->config_type)
581 e_config_profile_set("standard"); 583 {
584 case E_CONFIG_PROFILE_TYPE_DESKTOP:
585 type = "standard";
586 break;
587 case E_CONFIG_PROFILE_TYPE_MOBILE:
588 type = "mobile";
589 break;
590 //case E_CONFIG_PROFILE_TYPE_TABLET: FIXME - not used
591 default:
592 type = "default";
593 break;
594 }
595 e_config_profile_set(type);
582 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings")); 596 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
583 e_config_profile_set(prof); 597 e_config_profile_set(prof);
584 eina_stringshare_del(prof); 598 eina_stringshare_del(prof);
diff --git a/src/modules/conf_bindings/e_int_config_signalbindings.c b/src/modules/conf_bindings/e_int_config_signalbindings.c
index f57faca52..6d76b83f7 100644
--- a/src/modules/conf_bindings/e_int_config_signalbindings.c
+++ b/src/modules/conf_bindings/e_int_config_signalbindings.c
@@ -733,9 +733,23 @@ _restore_signal_binding_defaults_cb(void *data, void *data2 __UNUSED__)
733 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings")); 733 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
734 if (!ecb) 734 if (!ecb)
735 { 735 {
736 const char *type;
737
736 prof = eina_stringshare_ref(e_config_profile_get()); 738 prof = eina_stringshare_ref(e_config_profile_get());
737 /* FIXME: need some type of parenting/typing system for profiles */ 739 switch (e_config->config_type)
738 e_config_profile_set("standard"); 740 {
741 case E_CONFIG_PROFILE_TYPE_DESKTOP:
742 type = "standard";
743 break;
744 case E_CONFIG_PROFILE_TYPE_MOBILE:
745 type = "mobile";
746 break;
747 //case E_CONFIG_PROFILE_TYPE_TABLET: FIXME - not used
748 default:
749 type = "default";
750 break;
751 }
752 e_config_profile_set(type);
739 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings")); 753 ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
740 e_config_profile_set(prof); 754 e_config_profile_set(prof);
741 eina_stringshare_del(prof); 755 eina_stringshare_del(prof);