enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

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
This commit is contained in:
Mike Blumenkrantz 2014-01-27 11:25:24 -05:00
parent 6c79b3ea87
commit 3aa7a32618
4 changed files with 64 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/conf_bindings/e_int_config_edgebindings.c
View File

@ -512,9 +512,23 @@ _restore_edge_binding_defaults_cb(void *data, void *data2 __UNUSED__)
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
if (!ecb)
{
const char *type;
prof = eina_stringshare_ref(e_config_profile_get());
/* FIXME: need some type of parenting/typing system for profiles */
e_config_profile_set("standard");
switch (e_config->config_type)
{
case E_CONFIG_PROFILE_TYPE_DESKTOP:
type = "standard";
break;
case E_CONFIG_PROFILE_TYPE_MOBILE:
type = "mobile";
break;
//case E_CONFIG_PROFILE_TYPE_TABLET: FIXME - not used
default:
type = "default";
break;
}
e_config_profile_set(type);
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
e_config_profile_set(prof);
eina_stringshare_del(prof);

18
src/modules/conf_bindings/e_int_config_keybindings.c
View File

@ -476,9 +476,23 @@ _restore_key_binding_defaults_cb(void *data,
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
if (!ecb)
{
const char *type;
prof = eina_stringshare_ref(e_config_profile_get());
/* FIXME: need some type of parenting/typing system for profiles */
e_config_profile_set("standard");
switch (e_config->config_type)
{
case E_CONFIG_PROFILE_TYPE_DESKTOP:
type = "standard";
break;
case E_CONFIG_PROFILE_TYPE_MOBILE:
type = "mobile";
break;
//case E_CONFIG_PROFILE_TYPE_TABLET: FIXME - not used
default:
type = "default";
break;
}
e_config_profile_set(type);
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
e_config_profile_set(prof);
eina_stringshare_del(prof);

18
src/modules/conf_bindings/e_int_config_mousebindings.c
View File

@ -576,9 +576,23 @@ _restore_mouse_binding_defaults_cb(void *data, void *data2 __UNUSED__)
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
if (!ecb)
{
const char *type;
prof = eina_stringshare_ref(e_config_profile_get());
/* FIXME: need some type of parenting/typing system for profiles */
e_config_profile_set("standard");
switch (e_config->config_type)
{
case E_CONFIG_PROFILE_TYPE_DESKTOP:
type = "standard";
break;
case E_CONFIG_PROFILE_TYPE_MOBILE:
type = "mobile";
break;
//case E_CONFIG_PROFILE_TYPE_TABLET: FIXME - not used
default:
type = "default";
break;
}
e_config_profile_set(type);
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
e_config_profile_set(prof);
eina_stringshare_del(prof);

18
src/modules/conf_bindings/e_int_config_signalbindings.c
View File

@ -733,9 +733,23 @@ _restore_signal_binding_defaults_cb(void *data, void *data2 __UNUSED__)
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
if (!ecb)
{
const char *type;
prof = eina_stringshare_ref(e_config_profile_get());
/* FIXME: need some type of parenting/typing system for profiles */
e_config_profile_set("standard");
switch (e_config->config_type)
{
case E_CONFIG_PROFILE_TYPE_DESKTOP:
type = "standard";
break;
case E_CONFIG_PROFILE_TYPE_MOBILE:
type = "mobile";
break;
//case E_CONFIG_PROFILE_TYPE_TABLET: FIXME - not used
default:
type = "default";
break;
}
e_config_profile_set(type);
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
e_config_profile_set(prof);
eina_stringshare_del(prof);