summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2015-06-23 15:58:45 +0300
committerDaniel Zaoui <daniel.zaoui@samsung.com>2015-06-23 16:05:47 +0300
commit631c0bc8de5f2bcb0d4c66f246ae76aef0668bd0 (patch)
tree103f00b34a1b9be6bafde6ea48b5a1c2a62078c9
parent42beb36d041a4b1d3a91f8eff76d5908e2f92d58 (diff)
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
-rw-r--r--src/lib/elm_cnp.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index f03a0dea1..e20fbb1d3 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -23,7 +23,6 @@ enum
23 CNP_ATOM_TARGETS = 0, 23 CNP_ATOM_TARGETS = 0,
24 CNP_ATOM_ATOM, 24 CNP_ATOM_ATOM,
25 CNP_ATOM_LISTING_ATOMS = CNP_ATOM_ATOM, 25 CNP_ATOM_LISTING_ATOMS = CNP_ATOM_ATOM,
26 CNP_ATOM_text_uri,
27 CNP_ATOM_text_urilist, 26 CNP_ATOM_text_urilist,
28 CNP_ATOM_text_x_vcard, 27 CNP_ATOM_text_x_vcard,
29 CNP_ATOM_image_png, 28 CNP_ATOM_image_png,
@@ -454,14 +453,6 @@ static Cnp_Atom _atoms[CNP_N_ATOMS] = {
454 .x_converter = _x11_general_converter, 453 .x_converter = _x11_general_converter,
455#endif 454#endif
456 }, 455 },
457 ARRAYINIT(CNP_ATOM_text_uri) {
458 .name = "text/uri",
459 .formats = ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE, /* Either images or entries */
460#ifdef HAVE_ELEMENTARY_X
461 .x_converter = _x11_general_converter,
462 .x_data_preparer = _x11_data_preparer_uri,
463#endif
464 },
465 ARRAYINIT(CNP_ATOM_text_urilist) { 456 ARRAYINIT(CNP_ATOM_text_urilist) {
466 .name = "text/uri-list", 457 .name = "text/uri-list",
467 .formats = ELM_SEL_FORMAT_IMAGE, 458 .formats = ELM_SEL_FORMAT_IMAGE,
@@ -930,8 +921,7 @@ _x11_notify_handler_targets(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Noti
930 { 921 {
931 if ((_atoms[j].x_atom == atomlist[i]) && (_atoms[j].x_data_preparer)) 922 if ((_atoms[j].x_atom == atomlist[i]) && (_atoms[j].x_data_preparer))
932 { 923 {
933 if ((j == CNP_ATOM_text_uri) || 924 if ((j == CNP_ATOM_text_urilist))
934 (j == CNP_ATOM_text_urilist))
935 { 925 {
936 if (!_x11_is_uri_type_data(sel, notify)) continue; 926 if (!_x11_is_uri_type_data(sel, notify)) continue;
937 } 927 }
@@ -3371,8 +3361,7 @@ _wl_drops_accept(const char *type)
3371 { 3361 {
3372 case ELM_SEL_FORMAT_TARGETS: 3362 case ELM_SEL_FORMAT_TARGETS:
3373 case ELM_SEL_FORMAT_IMAGE: 3363 case ELM_SEL_FORMAT_IMAGE:
3374 if ((!strncmp(type, "text/uri", 8)) || 3364 if (!strncmp(type, "image/", 6))
3375 (!strncmp(type, "image/", 6)))
3376 { 3365 {
3377 wl_cnp_selection.requestwidget = drop->obj; 3366 wl_cnp_selection.requestwidget = drop->obj;
3378 return EINA_TRUE; 3367 return EINA_TRUE;