styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove E_Conf usage in conf theme

This commit is contained in:
Mike Blumenkrantz 2015-03-18 17:45:39 -04:00
parent 2103aeb2eb
commit 2617f2a352
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/conf_theme/e_int_config_borders.c
View File

@ -13,7 +13,6 @@ static void _basic_apply_border(E_Config_Dialog_Data *cfdata);
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
E_Client *client; E_Client *client;
E_Comp *comp;
const char *bordername; const char *bordername;
int remember_border; int remember_border;
}; };
@ -76,11 +75,8 @@ _create_data(E_Config_Dialog *cfd)
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1); cfdata = E_NEW(E_Config_Dialog_Data, 1);
cfdata->comp = NULL;
cfdata->client = NULL; cfdata->client = NULL;
if (!cfd->data) if (cfd->data)
cfdata->comp = e_comp;
else
cfdata->client = cfd->data; cfdata->client = cfd->data;
_fill_data(cfdata); _fill_data(cfdata);
@ -133,12 +129,12 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
if (cfdata->client) if (cfdata->client)
_basic_apply_border(cfdata); _basic_apply_border(cfdata);
else if (cfdata->comp) else
{ {
Eina_List *l; Eina_List *l;
E_Client *ec; E_Client *ec;
eina_stringshare_replace(&e_config->theme_default_border_style, cfdata->bordername); eina_stringshare_replace(&e_config->theme_default_border_style, cfdata->bordername);
EINA_LIST_FOREACH(cfdata->comp->clients, l, ec) EINA_LIST_FOREACH(e_comp->clients, l, ec)
{ {
if (e_client_util_ignored_get(ec)) continue; if (e_client_util_ignored_get(ec)) continue;
EC_CHANGED(ec); EC_CHANGED(ec);

4
src/modules/conf_theme/e_int_config_wallpaper.c
View File

@ -338,15 +338,13 @@ _fill_data(E_Config_Dialog_Data *cfdata)
else else
{ {
/* get current desk. advanced mode allows selecting all, screen or desk */ /* get current desk. advanced mode allows selecting all, screen or desk */
E_Comp *comp;
E_Zone *zone; E_Zone *zone;
E_Desk *desk; E_Desk *desk;
comp = e_manager_current_get()->comp;
zone = e_zone_current_get(); zone = e_zone_current_get();
desk = e_desk_current_get(zone); desk = e_desk_current_get(zone);
cfbg = e_bg_config_get(comp->num, zone->num, desk->x, desk->y); cfbg = e_bg_config_get(e_comp->num, zone->num, desk->x, desk->y);
/* if we have a config for this bg, use it. */ /* if we have a config for this bg, use it. */
if (cfbg) if (cfbg)
{ {