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

remove e_comp_util_evas_object_comp_get() usage

This commit is contained in:
Mike Blumenkrantz 2015-03-13 15:24:13 -04:00
parent c8fcff8109
commit dd5cf53542
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_comp.c
View File

@ -1632,18 +1632,16 @@ e_comp_client_redirect_toggle(E_Client *ec)
EAPI Eina_Bool
e_comp_util_object_is_above_nocomp(Evas_Object *obj)
{
E_Comp *comp;
Evas_Object *o;
int cl, ol;
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
if (!evas_object_visible_get(obj)) return EINA_FALSE;
comp = e_comp_util_evas_object_comp_get(obj);
if (!comp->nocomp_ec) return EINA_FALSE;
cl = evas_object_layer_get(comp->nocomp_ec->frame);
if (!e_comp->nocomp_ec) return EINA_FALSE;
cl = evas_object_layer_get(e_comp->nocomp_ec->frame);
ol = evas_object_layer_get(obj);
if (cl > ol) return EINA_FALSE;
o = evas_object_above_get(comp->nocomp_ec->frame);
o = evas_object_above_get(e_comp->nocomp_ec->frame);
if ((cl == ol) && (evas_object_layer_get(o) == cl))
{
do {

2
src/modules/syscon/e_syscon.c
View File

@ -292,7 +292,7 @@ e_syscon_hide(void)
E_FREE_FUNC(deftimer, ecore_timer_del);
eina_stringshare_replace(&do_defact, NULL);
E_FREE_LIST(handlers, ecore_event_handler_del);
e_comp_ungrab_input(e_comp_util_evas_object_comp_get(popup), 1, 1);
e_comp_ungrab_input(e_comp, 1, 1);
evas_object_hide(popup);
E_FREE_FUNC(popup, evas_object_del);
o_selected_flow = o_selected = o_flow_extra = o_flow_main = o_flow_secondary = NULL;