elm_cnp: fix priority of plain text type

Change-Id: I6510081703c459c299c97c0666353d9d9a98c33b

diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 9f70d9ac7eea75d9d1c169f87d9da3dc4d7dd75c..1011f3b0fc23a2127abc48fd09f141b6fd1ac3e9 100644 (file)
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -39,13 +39,12 @@ enum
    CNP_ATOM_text_html_utf8,
    CNP_ATOM_text_html,
 #endif
+   CNP_ATOM_text_plain_utf8,
    CNP_ATOM_UTF8STRING,
    CNP_ATOM_STRING,
    CNP_ATOM_COMPOUND_TEXT,
    CNP_ATOM_TEXT,
-   CNP_ATOM_text_plain_utf8,
    CNP_ATOM_text_plain,
-
    CNP_N_ATOMS,
 };
 
@@ -650,9 +649,9 @@ static Cnp_Atom _atoms[CNP_N_ATOMS] = {
       .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,
+   ARRAYINIT(CNP_ATOM_text_plain_utf8) {
+        .name = "text/plain;charset=utf-8",
+        .formats = ELM_SEL_FORMAT_TEXT,
 #ifdef HAVE_ELEMENTARY_X
         .x_converter = _x11_text_converter,
         .x_data_preparer = _x11_data_preparer_text,
@@ -662,8 +661,8 @@ static Cnp_Atom _atoms[CNP_N_ATOMS] = {
         .wl_data_preparer = _wl_data_preparer_text,
 #endif
    },
-   ARRAYINIT(CNP_ATOM_STRING) {
-        .name = "STRING",
+   ARRAYINIT(CNP_ATOM_UTF8STRING) {
+        .name = "UTF8_STRING",
         .formats = ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
 #ifdef HAVE_ELEMENTARY_X
         .x_converter = _x11_text_converter,
@@ -674,8 +673,8 @@ static Cnp_Atom _atoms[CNP_N_ATOMS] = {
         .wl_data_preparer = _wl_data_preparer_text,
 #endif
    },
-   ARRAYINIT(CNP_ATOM_COMPOUND_TEXT) {
-        .name = "COMPOUND_TEXT",
+   ARRAYINIT(CNP_ATOM_STRING) {
+        .name = "STRING",
         .formats = ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
 #ifdef HAVE_ELEMENTARY_X
         .x_converter = _x11_text_converter,
@@ -686,8 +685,8 @@ static Cnp_Atom _atoms[CNP_N_ATOMS] = {
         .wl_data_preparer = _wl_data_preparer_text,
 #endif
    },
-   ARRAYINIT(CNP_ATOM_TEXT) {
-        .name = "TEXT",
+   ARRAYINIT(CNP_ATOM_COMPOUND_TEXT) {
+        .name = "COMPOUND_TEXT",
         .formats = ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
 #ifdef HAVE_ELEMENTARY_X
         .x_converter = _x11_text_converter,
@@ -698,8 +697,8 @@ static Cnp_Atom _atoms[CNP_N_ATOMS] = {
         .wl_data_preparer = _wl_data_preparer_text,
 #endif
    },
-   ARRAYINIT(CNP_ATOM_text_plain_utf8) {
-        .name = "text/plain;charset=utf-8",
+   ARRAYINIT(CNP_ATOM_TEXT) {
+        .name = "TEXT",
         .formats = ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
 #ifdef HAVE_ELEMENTARY_X
         .x_converter = _x11_text_converter,