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

cnp: Adjusted to Eo2.

This commit is contained in:
Tom Hacohen 2014-04-03 14:54:14 +01:00
parent 5ea9873316
commit b39519aa12
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
legacy/elementary/src/lib/elm_cnp.c
View File

@ -208,7 +208,7 @@ static void
_all_drop_targets_cbs_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED)
{
Dropable *dropable = NULL;
eo_do(obj, eo_base_data_get("__elm_dropable", (void **)&dropable));
eo_do(obj, dropable = eo_key_data_get("__elm_dropable"));
if (dropable)
{
Dropable_Cbs *cbs;
@ -1214,7 +1214,7 @@ _x11_dropable_list_geom_find(Ecore_X_Window win, Evas_Coord px, Evas_Coord py)
*/
while (object)
{
eo_do(object, eo_base_data_get("__elm_dropable", (void **)&dropable));
eo_do(object, dropable = eo_key_data_get("__elm_dropable"));
if (dropable)
{
Eina_Bool exist = EINA_FALSE;
@ -2025,7 +2025,7 @@ _x11_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format,
cbs->dropdata = dropdata;
cbs->types = format;
eo_do(obj, eo_base_data_get("__elm_dropable", (void **)&dropable));
eo_do(obj, dropable = eo_key_data_get("__elm_dropable"));
if (!dropable)
{
/* Create new drop */
@ -2035,7 +2035,7 @@ _x11_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format,
drops = eina_list_append(drops, dropable);
if (!drops) goto error;
dropable->obj = obj;
eo_do(obj, eo_base_data_set("__elm_dropable", dropable, NULL));
eo_do(obj, eo_key_data_set("__elm_dropable", dropable, NULL));
}
dropable->cbs_list = eina_inlist_append(dropable->cbs_list, EINA_INLIST_GET(cbs));
@ -2071,14 +2071,14 @@ _x11_elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format,
Elm_Drag_Pos poscb, void *posdata,
Elm_Drop_Cb dropcb, void *dropdata)
{
Dropable *dropable;
Dropable *dropable = NULL;
Eina_List *l;
Ecore_X_Window xwin;
Eina_Bool have_drops = EINA_FALSE;
_x11_elm_cnp_init();
eo_do(obj, eo_base_data_get("__elm_dropable", (void **)&dropable));
eo_do(obj, dropable = eo_key_data_get("__elm_dropable"));
if (dropable)
{
Eina_Inlist *itr;
@ -2099,7 +2099,7 @@ _x11_elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format,
if (!dropable->cbs_list)
{
drops = eina_list_remove(drops, dropable);
eo_do(obj, eo_base_data_del("__elm_dropable"));
eo_do(obj, eo_key_data_del("__elm_dropable"));
free(dropable);
dropable = NULL;
evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
@ -2749,7 +2749,7 @@ _wl_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State
cbs->dropdata = dropdata;
cbs->types = format;
eo_do(obj, eo_base_data_get("__elm_dropable", (void **)&dropable));
eo_do(obj, dropable = eo_key_data_get("__elm_dropable"));
if (!dropable)
{
/* Create new drop */
@ -2758,7 +2758,7 @@ _wl_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State
drops = eina_list_append(drops, dropable);
if (!drops) goto error;
dropable->obj = obj;
eo_do(obj, eo_base_data_set("__elm_dropable", dropable, NULL));
eo_do(obj, eo_key_data_set("__elm_dropable", dropable, NULL));
}
dropable->cbs_list = eina_inlist_append(dropable->cbs_list, EINA_INLIST_GET(cbs));
@ -2795,9 +2795,9 @@ _wl_elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format,
Elm_Drag_Pos poscb, void *posdata,
Elm_Drop_Cb dropcb, void *dropdata)
{
Dropable *dropable;
Dropable *dropable = NULL;
eo_do(obj, eo_base_data_get("__elm_dropable", (void **)&dropable));
eo_do(obj, dropable = eo_key_data_get("__elm_dropable"));
if (dropable)
{
Eina_Inlist *itr;
@ -2818,7 +2818,7 @@ _wl_elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format,
if (!dropable->cbs_list)
{
drops = eina_list_remove(drops, dropable);
eo_do(obj, eo_base_data_del("__elm_dropable"));
eo_do(obj, eo_key_data_del("__elm_dropable"));
ELM_SAFE_FREE(dropable, free);
evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
_all_drop_targets_cbs_del);