From 73737bcc4f1f263adcb2c4795d5eea1e06aea2d0 Mon Sep 17 00:00:00 2001 From: Mathieu H Date: Mon, 13 Apr 2020 15:27:40 +0000 Subject: [PATCH] Remove the blacklist list in convert-emoji.c since now it is supported --- gtk/emoji/convert-emoji.c | 41 -------------------------------------- gtk/emoji/emoji.data | Bin 53533 -> 55307 bytes 2 files changed, 41 deletions(-) diff --git a/gtk/emoji/convert-emoji.c b/gtk/emoji/convert-emoji.c index 49571b4157..92bf66b385 100644 --- a/gtk/emoji/convert-emoji.c +++ b/gtk/emoji/convert-emoji.c @@ -55,35 +55,6 @@ parse_code (GVariantBuilder *b, return TRUE; } -static const char *blacklist[] = { - "child", - "adult", - "older adult", - "woman with headscarf", - "bearded person", - "breast-feeding", - "mage", - "fairy", - "vampire", - "merperson", - "merman", - "mermaid", - " elf", // avoid matching selfie - "genie", - "zombie", - "in steamy room", - "climbing", - "in lotus position", - "person in bed", - "man in suit levitating", - "horse racing", - "snowboarder", - "golfing", - "love-you gesture", - "palms up together", - NULL -}; - int main (int argc, char *argv[]) { @@ -171,18 +142,6 @@ main (int argc, char *argv[]) name = json_object_get_string_member (obj, "name"); code = g_strdup (json_object_get_string_member (obj, "code")); - if (strcmp (name, "world map") == 0) - continue; - - skip = FALSE; - for (j = 0; blacklist[j]; j++) - { - if (strstr (name, blacklist[j]) != 0) - skip = TRUE; - } - if (skip) - continue; - has_variations = FALSE; while (i < length) { diff --git a/gtk/emoji/emoji.data b/gtk/emoji/emoji.data index fdf919d66f49c9e2256fc9cf705df58c231e88bf..15d093d933e9f685b945b6ff8671136458a16481 100644 GIT binary patch delta 4664 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 H9K}V&LsBF=