diff --git a/src/modules/illume2/e_illume.c b/src/modules/illume2/e_illume.c index 0cc6e920e..025456598 100644 --- a/src/modules/illume2/e_illume.c +++ b/src/modules/illume2/e_illume.c @@ -44,7 +44,7 @@ e_illume_zone_config_get(int id) eina_list_append(_e_illume_cfg->policy.zones, cz); /* save it in config */ - e_mod_config_save(); + e_mod_illume_config_save(); /* return a fallback */ return cz; diff --git a/src/modules/illume2/e_mod_config.c b/src/modules/illume2/e_mod_config.c index bb056edfa..14745626e 100644 --- a/src/modules/illume2/e_mod_config.c +++ b/src/modules/illume2/e_mod_config.c @@ -5,37 +5,37 @@ #include "e_mod_config_policy.h" /* local function prototypes */ -static void _e_mod_config_free(void); -static void _e_mod_config_new(void); +static void _e_mod_illume_config_free(void); +static void _e_mod_illume_config_new(void); /* local variables */ -static E_Config_DD *_conf_edd = NULL; -static E_Config_DD *_conf_zone_edd = NULL; +static E_Config_DD *_il_conf_edd = NULL; +static E_Config_DD *_il_conf_zone_edd = NULL; /* external variables */ E_Illume_Config *_e_illume_cfg = NULL; -int -e_mod_config_init(void) +EAPI int +e_mod_illume_config_init(void) { char buff[PATH_MAX]; /* create config structure for zones */ - _conf_zone_edd = E_CONFIG_DD_NEW("Illume_Config_Zone", E_Illume_Config_Zone); + _il_conf_zone_edd = E_CONFIG_DD_NEW("Illume_Config_Zone", E_Illume_Config_Zone); #undef T #undef D #define T E_Illume_Config_Zone -#define D _conf_zone_edd +#define D _il_conf_zone_edd E_CONFIG_VAL(D, T, id, INT); E_CONFIG_VAL(D, T, mode.dual, INT); E_CONFIG_VAL(D, T, mode.side, INT); /* create config structure for module */ - _conf_edd = E_CONFIG_DD_NEW("Illume_Config", E_Illume_Config); + _il_conf_edd = E_CONFIG_DD_NEW("Illume_Config", E_Illume_Config); #undef T #undef D #define T E_Illume_Config -#define D _conf_edd +#define D _il_conf_edd E_CONFIG_VAL(D, T, version, INT); E_CONFIG_VAL(D, T, animation.vkbd.duration, INT); E_CONFIG_VAL(D, T, animation.quickpanel.duration, INT); @@ -72,17 +72,17 @@ e_mod_config_init(void) E_CONFIG_VAL(D, T, policy.home.match.name, INT); E_CONFIG_VAL(D, T, policy.home.match.title, INT); E_CONFIG_VAL(D, T, policy.home.match.type, INT); - E_CONFIG_LIST(D, T, policy.zones, _conf_zone_edd); + E_CONFIG_LIST(D, T, policy.zones, _il_conf_zone_edd); /* attempt to load existing configuration */ - _e_illume_cfg = e_config_domain_load("module.illume2", _conf_edd); + _e_illume_cfg = e_config_domain_load("module.illume2", _il_conf_edd); /* check version */ if ((_e_illume_cfg) && ((_e_illume_cfg->version >> 16) < IL_CONFIG_MAJOR)) - _e_mod_config_free(); + _e_mod_illume_config_free(); /* create new config if we need to */ - if (!_e_illume_cfg) _e_mod_config_new(); + if (!_e_illume_cfg) _e_mod_illume_config_new(); /* setup category for config panel */ snprintf(buff, sizeof(buff), "%s/e-module-illume2.edj", _e_illume_mod_dir); @@ -102,8 +102,8 @@ e_mod_config_init(void) return 1; } -int -e_mod_config_shutdown(void) +EAPI int +e_mod_illume_config_shutdown(void) { /* destroy config item entries */ e_configure_registry_item_del("illume/windows"); @@ -114,24 +114,24 @@ e_mod_config_shutdown(void) e_configure_registry_category_del("illume"); /* free config structure */ - _e_mod_config_free(); + _e_mod_illume_config_free(); /* free data descriptors */ - E_CONFIG_DD_FREE(_conf_zone_edd); - E_CONFIG_DD_FREE(_conf_edd); + E_CONFIG_DD_FREE(_il_conf_zone_edd); + E_CONFIG_DD_FREE(_il_conf_edd); return 1; } -int -e_mod_config_save(void) +EAPI int +e_mod_illume_config_save(void) { - return e_config_domain_save("module.illume2", _conf_edd, _e_illume_cfg); + return e_config_domain_save("module.illume2", _il_conf_edd, _e_illume_cfg); } /* local functions */ static void -_e_mod_config_free(void) +_e_mod_illume_config_free(void) { E_Illume_Config_Zone *cz; @@ -192,7 +192,7 @@ _e_mod_config_free(void) } static void -_e_mod_config_new(void) +_e_mod_illume_config_new(void) { E_Illume_Config_Zone *cz; diff --git a/src/modules/illume2/e_mod_config.h b/src/modules/illume2/e_mod_config.h index 9d740a38f..0b02fba15 100644 --- a/src/modules/illume2/e_mod_config.h +++ b/src/modules/illume2/e_mod_config.h @@ -4,8 +4,8 @@ # define IL_CONFIG_MAJOR 0 # define IL_CONFIG_MINOR 1 -int e_mod_config_init(void); -int e_mod_config_shutdown(void); -int e_mod_config_save(void); +EAPI int e_mod_illume_config_init(void); +EAPI int e_mod_illume_config_shutdown(void); +EAPI int e_mod_illume_config_save(void); #endif diff --git a/src/modules/illume2/e_mod_main.c b/src/modules/illume2/e_mod_main.c index de66f1a16..0d931602e 100644 --- a/src/modules/illume2/e_mod_main.c +++ b/src/modules/illume2/e_mod_main.c @@ -30,7 +30,7 @@ e_modapi_init(E_Module *m) _e_illume_mod_dir = eina_stringshare_add(m->dir); /* try to initialize the config subsystem */ - if (!e_mod_config_init()) + if (!e_mod_illume_config_init()) { /* clear module directory variable */ if (_e_illume_mod_dir) eina_stringshare_del(_e_illume_mod_dir); @@ -43,7 +43,7 @@ e_modapi_init(E_Module *m) if (!e_mod_policy_init()) { /* shutdown the config subsystem */ - e_mod_config_shutdown(); + e_mod_illume_config_shutdown(); /* clear module directory variable */ if (_e_illume_mod_dir) eina_stringshare_del(_e_illume_mod_dir); @@ -131,7 +131,7 @@ e_modapi_shutdown(E_Module *m) e_mod_policy_shutdown(); /* shutdown the config subsystem */ - e_mod_config_shutdown(); + e_mod_illume_config_shutdown(); /* clear module directory variable */ if (_e_illume_mod_dir) eina_stringshare_del(_e_illume_mod_dir); @@ -143,5 +143,5 @@ e_modapi_shutdown(E_Module *m) EAPI int e_modapi_save(E_Module *m) { - return e_mod_config_save(); + return e_mod_illume_config_save(); }