From: Taehyub Kim <taehyub.kim@samsung.com>
Date: Fri, 9 Dec 2016 07:29:48 +0000 (+0900)
Subject: elm_cnp: disable html type for x protocol
X-Git-Tag: accepted/tizen/common/20170102.152333~79
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef5c439a2d2e2f32c4af3774a74539787401697a;p=platform%2Fupstream%2Felementary.git

elm_cnp: disable html type for x protocol

Change-Id: I807c34994d9a98f2223ca17bb46e7352539af44f
---

diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 388a2a0..f933253 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -35,8 +35,10 @@ enum
    CNP_ATOM_image_tga,
    CNP_ATOM_image_ppm,
    CNP_ATOM_XELM,
+#ifdef HAVE_ELEMENTARY_WAYLAND
    CNP_ATOM_text_html_utf8,
    CNP_ATOM_text_html,
+#endif
    CNP_ATOM_UTF8STRING,
    CNP_ATOM_STRING,
    CNP_ATOM_COMPOUND_TEXT,
@@ -612,31 +614,42 @@ static Cnp_Atom _atoms[CNP_N_ATOMS] = {
         .wl_data_preparer = _wl_data_preparer_image,
 #endif
    },
+/*
+#ifdef HAVE_ELEMENTARY_X
    ARRAYINIT(CNP_ATOM_text_html_utf8) {
       .name = "text/html;charset=utf-8",
       .formats = ELM_SEL_FORMAT_HTML,
-#ifdef HAVE_ELEMENTARY_X
       .x_converter = _x11_general_converter,
       .x_notify = _x11_notify_handler_html,
+   },
 #endif
+*/
 #ifdef HAVE_ELEMENTARY_WAYLAND
-        .wl_converter = _wl_general_converter,
-        .wl_data_preparer = _wl_data_preparer_handler_html,
-#endif
-
+   ARRAYINIT(CNP_ATOM_text_html_utf8) {
+      .name = "text/html;charset=utf-8",
+      .formats = ELM_SEL_FORMAT_HTML,
+      .wl_converter = _wl_general_converter,
+      .wl_data_preparer = _wl_data_preparer_handler_html,
    },
+#endif
+/*
+#ifdef HAVE_ELEMENTARY_X
    ARRAYINIT(CNP_ATOM_text_html) {
       .name = "text/html",
       .formats = ELM_SEL_FORMAT_HTML,
-#ifdef HAVE_ELEMENTARY_X
       .x_converter = _x11_general_converter,
       .x_notify = _x11_notify_handler_html,
+   },
 #endif
+*/
 #ifdef HAVE_ELEMENTARY_WAYLAND
-        .wl_converter = _wl_general_converter,
-        .wl_data_preparer = _wl_data_preparer_handler_html,
-#endif
+   ARRAYINIT(CNP_ATOM_text_html) {
+      .name = "text/html",
+      .formats = ELM_SEL_FORMAT_HTML,
+      .wl_converter = _wl_general_converter,
+      .wl_data_preparer = _wl_data_preparer_handler_html,
    },
+#endif
    ARRAYINIT(CNP_ATOM_UTF8STRING) {
         .name = "UTF8_STRING",
         .formats = ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,