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

DnD: remove text/uri handling 

This type is not a standard type and can be handled as a text/uri-list
of one uri.

@fix
This commit is contained in:
Daniel Zaoui 2015-06-23 15:58:45 +03:00
parent 422e28129e
commit 5eeb1f5622
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@ enum
CNP_ATOM_TARGETS = 0, CNP_ATOM_TARGETS = 0,
CNP_ATOM_ATOM, CNP_ATOM_ATOM,
CNP_ATOM_LISTING_ATOMS = CNP_ATOM_ATOM, CNP_ATOM_LISTING_ATOMS = CNP_ATOM_ATOM,
CNP_ATOM_text_uri,
CNP_ATOM_text_urilist, CNP_ATOM_text_urilist,
CNP_ATOM_text_x_vcard, CNP_ATOM_text_x_vcard,
CNP_ATOM_image_png, CNP_ATOM_image_png,
@ -452,14 +451,6 @@ static Cnp_Atom _atoms[CNP_N_ATOMS] = {
.formats = ELM_SEL_FORMAT_MARKUP, .formats = ELM_SEL_FORMAT_MARKUP,
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
.x_converter = _x11_general_converter, .x_converter = _x11_general_converter,
#endif
},
ARRAYINIT(CNP_ATOM_text_uri) {
.name = "text/uri",
.formats = ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE, /* Either images or entries */
#ifdef HAVE_ELEMENTARY_X
.x_converter = _x11_general_converter,
.x_data_preparer = _x11_data_preparer_uri,
#endif #endif
}, },
ARRAYINIT(CNP_ATOM_text_urilist) { ARRAYINIT(CNP_ATOM_text_urilist) {
@ -930,8 +921,7 @@ _x11_notify_handler_targets(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Noti
{ {
if ((_atoms[j].x_atom == atomlist[i]) && (_atoms[j].x_data_preparer)) if ((_atoms[j].x_atom == atomlist[i]) && (_atoms[j].x_data_preparer))
{ {
if ((j == CNP_ATOM_text_uri) || if ((j == CNP_ATOM_text_urilist))
(j == CNP_ATOM_text_urilist))
{ {
if (!_x11_is_uri_type_data(sel, notify)) continue; if (!_x11_is_uri_type_data(sel, notify)) continue;
} }
@ -3371,8 +3361,7 @@ _wl_drops_accept(const char *type)
{ {
case ELM_SEL_FORMAT_TARGETS: case ELM_SEL_FORMAT_TARGETS:
case ELM_SEL_FORMAT_IMAGE: case ELM_SEL_FORMAT_IMAGE:
if ((!strncmp(type, "text/uri", 8)) || if (!strncmp(type, "image/", 6))
(!strncmp(type, "image/", 6)))
{ {
wl_cnp_selection.requestwidget = drop->obj; wl_cnp_selection.requestwidget = drop->obj;
return EINA_TRUE; return EINA_TRUE;