From 49269c3173cff4a3a911aba33c52a6ca846e5b78 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Fri, 28 Dec 2018 15:20:00 +0100 Subject: [PATCH] Fix compilation with older versions of valac --- main/src/ui/util/helper.vala | 6 +++--- main/vapi/icu-uc.vapi | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala index 5e5988a1..da78b485 100644 --- a/main/src/ui/util/helper.vala +++ b/main/src/ui/util/helper.vala @@ -237,11 +237,11 @@ public int get_only_emoji_count(string markup_text) { emoji_no--; } - if (last_was_emoji && last_was_modifier_base && Unicode.has_binary_property(curchar, Unicode.EMOJI_MODIFIER)) { + if (last_was_emoji && last_was_modifier_base && Unicode.has_binary_property(curchar, Unicode.Property.EMOJI_MODIFIER)) { // still an emoji, but no longer a modifier base last_was_modifier_base = false; - } else if (Unicode.has_binary_property(curchar, Unicode.EMOJI_PRESENTATION)) { - if (Unicode.has_binary_property(curchar, Unicode.EMOJI_MODIFIER_BASE)) { + } else if (Unicode.has_binary_property(curchar, Unicode.Property.EMOJI_PRESENTATION)) { + if (Unicode.has_binary_property(curchar, Unicode.Property.EMOJI_MODIFIER_BASE)) { last_was_modifier_base = true; } emoji_no++; diff --git a/main/vapi/icu-uc.vapi b/main/vapi/icu-uc.vapi index 12cc0587..23732a15 100644 --- a/main/vapi/icu-uc.vapi +++ b/main/vapi/icu-uc.vapi @@ -1,6 +1,6 @@ namespace Unicode { [CCode (cprefix = "UCHAR_", cheader_filename = "unicode/uchar.h")] - enum Property { + public enum Property { EMOJI, EMOJI_PRESENTATION, EMOJI_MODIFIER, @@ -8,5 +8,5 @@ namespace Unicode { } [CCode (cname = "u_hasBinaryProperty", cheader_filename = "unicode/uchar.h")] - bool has_binary_property(unichar c, Property p); + public bool has_binary_property(unichar c, Property p); }