summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_key_grab.c
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-05-02 14:17:19 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-05-02 14:17:19 +0900
commitb64a2994b3b277cbe7fce17d7ee275fd0d78c925 (patch)
tree3fd83519240da48e2355dfc6caa2415a2a77e282 /src/lib/evas/canvas/evas_key_grab.c
parentaf401b408343b57ced7f98eaded1e4c59337d0aa (diff)
Revert "Efl: replace eo_data_get for objects data referencing."
This reverts commit 654a3f5f94c2464b8563d27da94a78398c112962.
Diffstat (limited to 'src/lib/evas/canvas/evas_key_grab.c')
-rw-r--r--src/lib/evas/canvas/evas_key_grab.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c
index 202c9bf..9f65c04 100644
--- a/src/lib/evas/canvas/evas_key_grab.c
+++ b/src/lib/evas/canvas/evas_key_grab.c
@@ -125,7 +125,7 @@ evas_key_grab_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, const c
125 125
126 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0); 126 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0);
127 if (!g) return; 127 if (!g) return;
128 Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 128 Evas_Object_Protected_Data *g_object = eo_data_get(g->object, EVAS_OBJ_CLASS);
129 g_object->grabs = eina_list_remove(g_object->grabs, g); 129 g_object->grabs = eina_list_remove(g_object->grabs, g);
130 obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs, g); 130 obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs, g);
131 if (g->keyname) free(g->keyname); 131 if (g->keyname) free(g->keyname);
@@ -200,7 +200,7 @@ _key_ungrab(Eo *eo_obj, void *_pd, va_list *list)
200 Evas_Object_Protected_Data *obj = _pd; 200 Evas_Object_Protected_Data *obj = _pd;
201 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0); 201 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0);
202 if (!g) return; 202 if (!g) return;
203 Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 203 Evas_Object_Protected_Data *g_object = eo_data_get(g->object, EVAS_OBJ_CLASS);
204 if (g_object->layer->evas->walking_grabs) 204 if (g_object->layer->evas->walking_grabs)
205 { 205 {
206 if (!g->delete_me) 206 if (!g->delete_me)