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

cnp: redo wayland drop to nul terminate for text_uri drops and free on every drop 

@fix
This commit is contained in:
Mike Blumenkrantz 2015-08-13 15:45:19 -04:00
parent f1e9d33bb6
commit 5c4ab5d971
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3238,18 +3238,14 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, char *data, size_t size)
if (cbs->types & drop->last.format)
{
s = (char*)eina_memdup((unsigned char*)data, size,
_wl_dropable_match(cbs, drop, ELM_SEL_FORMAT_TEXT));
savedtypes.textreq || _wl_dropable_match(cbs, drop, ELM_SEL_FORMAT_TEXT));
if (!s)
{
ecore_wl_dnd_drag_end(ecore_wl_input_get());
return;
}
if (savedtypes.textreq)
{
savedtypes.textreq = 0;
savedtypes.imgfile = s;
}
sdata.data = s;
if (_wl_dropable_match(cbs, drop, ELM_SEL_FORMAT_IMAGE))
{
/* If it's markup that also supports images */
@ -3257,19 +3253,16 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, char *data, size_t size)
sdata.format = ELM_SEL_FORMAT_MARKUP;
else
sdata.format = ELM_SEL_FORMAT_IMAGE;
sdata.data = (char *)savedtypes.imgfile;
}
else
{
sdata.format = drop->last.format;
sdata.data = s;
}
sdata.format = drop->last.format;
if (cbs->dropcb) cbs->dropcb(cbs->dropdata, drop->obj, &sdata);
free(s);
}
}
}
ecore_wl_dnd_drag_end(ecore_wl_input_get());
ELM_SAFE_FREE(savedtypes.imgfile, free);
savedtypes.textreq = 0;
}
static Dropable *