[EGIT] [core/enlightenment] master 05/26: remove e_comp_util_evas_object_comp_get() usage

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=dd5cf53542f48df87930fd581ef9a6c839767943

commit dd5cf53542f48df87930fd581ef9a6c839767943
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Mar 13 15:24:13 2015 -0400

    remove e_comp_util_evas_object_comp_get() usage
---
 src/bin/e_comp.c              | 8 +++-----
 src/modules/syscon/e_syscon.c | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 5bd741c..b5af525 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -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 {
diff --git a/src/modules/syscon/e_syscon.c b/src/modules/syscon/e_syscon.c
index 8242f53..627b825 100644
--- a/src/modules/syscon/e_syscon.c
+++ b/src/modules/syscon/e_syscon.c
@@ -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;

--