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

update contact module for api changes + remove E_Comp usage

This commit is contained in:
Mike Blumenkrantz 2015-03-18 17:46:42 -04:00
parent 2617f2a352
commit aefab90d52
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/contact/e_edges.c
View File

@ -104,8 +104,7 @@ _handler_call(E_Edges_Event event, int d, double v)
static Evas_Object *
_input_obj(Edgeset *es, int x, int y, int w, int h)
{
E_Comp *c = e_comp;
Evas_Object *o = evas_object_rectangle_add(c->evas);
Evas_Object *o = evas_object_rectangle_add(e_comp->evas);
evas_object_color_set(o, 0, 0, 0, 0);
evas_object_move(o, x, y);
evas_object_resize(o, w, h);

10
src/modules/contact/e_policy.c
View File

@ -8,7 +8,7 @@ static Eina_Bool _cb_event_focus_in(void *data __UNUSED__, int type __UNUSED__,
static Eina_Bool _cb_event_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event);
static void _cb_hook_post_fetch(void *data __UNUSED__, E_Client *ec);
static void _cb_hook_post_assign(void *data __UNUSED__, E_Client *ec);
static void _cb_hook_layout(E_Comp *comp);
static void _cb_hook_layout(void);
static Eina_List *hooks = NULL;
static Eina_List *handlers = NULL;
@ -166,7 +166,7 @@ _cb_hook_post_assign(void *data __UNUSED__, E_Client *ec)
}
static void
_cb_hook_layout(E_Comp *comp)
_cb_hook_layout(void)
{
Eina_List *l;
E_Client *ec, *kbd = NULL;;
@ -174,7 +174,7 @@ _cb_hook_layout(E_Comp *comp)
Eina_Bool have_focused = EINA_FALSE;
int kx = 0, ky = 0, kw = 0, kh = 0;
EINA_LIST_FOREACH(comp->clients, l, ec)
EINA_LIST_FOREACH(e_comp->clients, l, ec)
{
if (e_client_util_ignored_get(ec)) continue;
if (ec->focused) have_focused = EINA_TRUE;
@ -195,7 +195,7 @@ _cb_hook_layout(E_Comp *comp)
kx = kbd->zone->x;
ky = kbd->zone->y + kbd->zone->h - kh;
}
EINA_LIST_FOREACH(comp->clients, l, ec)
EINA_LIST_FOREACH(e_comp->clients, l, ec)
{
int x, y, w, h;
@ -237,7 +237,7 @@ _cb_hook_layout(E_Comp *comp)
else
{
#warning X ONLY! SPANK! SPANK! SPANK!!!
if (e_comp_data->illume.conformant.conformant)
if (ec->comp_data->illume.conformant.conformant)
{
if (kbd_on != want_kbd)
{