forked from enlightenment/enlightenment
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:
parent
6c79b3ea87
commit
3aa7a32618
|
@ -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"));
|
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
|
||||||
if (!ecb)
|
if (!ecb)
|
||||||
{
|
{
|
||||||
|
const char *type;
|
||||||
|
|
||||||
prof = eina_stringshare_ref(e_config_profile_get());
|
prof = eina_stringshare_ref(e_config_profile_get());
|
||||||
/* FIXME: need some type of parenting/typing system for profiles */
|
switch (e_config->config_type)
|
||||||
e_config_profile_set("standard");
|
{
|
||||||
|
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"));
|
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
|
||||||
e_config_profile_set(prof);
|
e_config_profile_set(prof);
|
||||||
eina_stringshare_del(prof);
|
eina_stringshare_del(prof);
|
||||||
|
|
|
@ -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"));
|
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
|
||||||
if (!ecb)
|
if (!ecb)
|
||||||
{
|
{
|
||||||
|
const char *type;
|
||||||
|
|
||||||
prof = eina_stringshare_ref(e_config_profile_get());
|
prof = eina_stringshare_ref(e_config_profile_get());
|
||||||
/* FIXME: need some type of parenting/typing system for profiles */
|
switch (e_config->config_type)
|
||||||
e_config_profile_set("standard");
|
{
|
||||||
|
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"));
|
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
|
||||||
e_config_profile_set(prof);
|
e_config_profile_set(prof);
|
||||||
eina_stringshare_del(prof);
|
eina_stringshare_del(prof);
|
||||||
|
|
|
@ -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"));
|
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
|
||||||
if (!ecb)
|
if (!ecb)
|
||||||
{
|
{
|
||||||
|
const char *type;
|
||||||
|
|
||||||
prof = eina_stringshare_ref(e_config_profile_get());
|
prof = eina_stringshare_ref(e_config_profile_get());
|
||||||
/* FIXME: need some type of parenting/typing system for profiles */
|
switch (e_config->config_type)
|
||||||
e_config_profile_set("standard");
|
{
|
||||||
|
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"));
|
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
|
||||||
e_config_profile_set(prof);
|
e_config_profile_set(prof);
|
||||||
eina_stringshare_del(prof);
|
eina_stringshare_del(prof);
|
||||||
|
|
|
@ -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"));
|
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
|
||||||
if (!ecb)
|
if (!ecb)
|
||||||
{
|
{
|
||||||
|
const char *type;
|
||||||
|
|
||||||
prof = eina_stringshare_ref(e_config_profile_get());
|
prof = eina_stringshare_ref(e_config_profile_get());
|
||||||
/* FIXME: need some type of parenting/typing system for profiles */
|
switch (e_config->config_type)
|
||||||
e_config_profile_set("standard");
|
{
|
||||||
|
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"));
|
ecb = e_config_domain_system_load("e_bindings", e_config_descriptor_find("E_Config_Bindings"));
|
||||||
e_config_profile_set(prof);
|
e_config_profile_set(prof);
|
||||||
eina_stringshare_del(prof);
|
eina_stringshare_del(prof);
|
||||||
|
|
Loading…
Reference in New Issue