jackdanielz pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=631c0bc8de5f2bcb0d4c66f246ae76aef0668bd0

commit 631c0bc8de5f2bcb0d4c66f246ae76aef0668bd0
Author: Daniel Zaoui <daniel.za...@samsung.com>
Date:   Tue Jun 23 15:58:45 2015 +0300

    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
---
 src/lib/elm_cnp.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index f03a0de..e20fbb1 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -23,7 +23,6 @@ enum
    CNP_ATOM_TARGETS = 0,
    CNP_ATOM_ATOM,
    CNP_ATOM_LISTING_ATOMS = CNP_ATOM_ATOM,
-   CNP_ATOM_text_uri,
    CNP_ATOM_text_urilist,
    CNP_ATOM_text_x_vcard,
    CNP_ATOM_image_png,
@@ -454,14 +453,6 @@ static Cnp_Atom _atoms[CNP_N_ATOMS] = {
         .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
-   },
    ARRAYINIT(CNP_ATOM_text_urilist) {
         .name = "text/uri-list",
         .formats = ELM_SEL_FORMAT_IMAGE,
@@ -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 ((j == CNP_ATOM_text_uri) ||
-                      (j == CNP_ATOM_text_urilist))
+                  if ((j == CNP_ATOM_text_urilist))
                     {
                        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_IMAGE:
-                   if ((!strncmp(type, "text/uri", 8)) ||
-                         (!strncmp(type, "image/", 6)))
+                   if (!strncmp(type, "image/", 6))
                      {
                         wl_cnp_selection.requestwidget = drop->obj;
                         return EINA_TRUE;

-- 


Reply via email to