enlightenment/ephoto
enlightenment
/
ephoto
7
0
Fork 3
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Ephoto: Don't use evas_object_data_set on elm_object_items

This commit is contained in:
Stephen okra Houston 2016-10-19 09:10:14 -05:00
parent 580dc2aa76
commit 7a3abcd7d9
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/ephoto_thumb_browser.c
View File

@ -820,13 +820,13 @@ static void
_grid_menu_rename_cb(void *data, Evas_Object *obj EINA_UNUSED, _grid_menu_rename_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
Elm_Object_Item *item = data; Ephoto_Thumb_Browser *tb = data;
Ephoto_Thumb_Browser *tb = evas_object_data_get(item, "thumb_browser"); Elm_Object_Item *item = evas_object_data_get(tb->main, "rename_item");
Ephoto_Entry *file; Ephoto_Entry *file;
file = elm_object_item_data_get(item); file = elm_object_item_data_get(item);
ephoto_file_rename(tb->ephoto, file->path); ephoto_file_rename(tb->ephoto, file->path);
evas_object_data_del(item, "thumb_browser"); evas_object_data_del(item, "rename_item");
} }
static void static void
@ -971,8 +971,9 @@ _grid_mouse_up_cb(void *data, Evas *e EINA_UNUSED,
if (item) if (item)
{ {
elm_menu_item_add(menu, NULL, "edit", _("Rename"), elm_menu_item_add(menu, NULL, "edit", _("Rename"),
_grid_menu_rename_cb, item); _grid_menu_rename_cb, tb);
evas_object_data_set(item, "thumb_browser", tb); evas_object_data_del(tb->main, "rename_item");
evas_object_data_set(tb->main, "rename_item", item);
} }
if (eina_list_count(selected)) if (eina_list_count(selected))
{ {
@ -1787,8 +1788,9 @@ _ephoto_main_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNU
eina_list_last(selected)); eina_list_last(selected));
if (it) if (it)
{ {
evas_object_data_set(it, "thumb_browser", tb); evas_object_data_del(tb->main, "rename_item");
_grid_menu_rename_cb(it, NULL, NULL); evas_object_data_set(tb->main, "rename_item", tb);
_grid_menu_rename_cb(tb, NULL, NULL);
} }
} }
else if (!strcasecmp(k, "F5")) else if (!strcasecmp(k, "F5"))