From be7e0c2d5689d962fd2424e60ed21062d0674e95 Mon Sep 17 00:00:00 2001
From: Xavier Del Campo Romero <xavi.dcr@tutanota.com>
Date: Mon, 11 Sep 2023 23:03:51 +0200
Subject: Backport Meson build support

Meson builds have better integration with Vala. For example, Meson
handles incremental compilation of Vala source files better than
CMake.

Limitations:

As done with CMake builds, gresource.xml should be compiled. Now, it has
been generated from a CMake build and manually copied into the source
tree.
---
 libdino/src/application.vala     |  1 -
 libdino/src/plugin/registry.vala | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'libdino/src')

diff --git a/libdino/src/application.vala b/libdino/src/application.vala
index aaec4a11..048a88ff 100644
--- a/libdino/src/application.vala
+++ b/libdino/src/application.vala
@@ -2,7 +2,6 @@ using Dino.Entities;
 
 namespace Dino {
 
-extern const string VERSION;
 public string get_version() { return VERSION; }
 public string get_short_version() {
     if (!VERSION.contains("~")) return VERSION;
diff --git a/libdino/src/plugin/registry.vala b/libdino/src/plugin/registry.vala
index e28c4de7..c75fbefe 100644
--- a/libdino/src/plugin/registry.vala
+++ b/libdino/src/plugin/registry.vala
@@ -3,14 +3,14 @@ using Gee;
 namespace Dino.Plugins {
 
 public class Registry {
-    internal ArrayList<EncryptionListEntry> encryption_list_entries = new ArrayList<EncryptionListEntry>();
-    internal HashMap<string, CallEncryptionEntry> call_encryption_entries = new HashMap<string, CallEncryptionEntry>();
-    internal ArrayList<AccountSettingsEntry> account_settings_entries = new ArrayList<AccountSettingsEntry>();
-    internal ArrayList<ContactDetailsProvider> contact_details_entries = new ArrayList<ContactDetailsProvider>();
-    internal Map<string, TextCommand> text_commands = new HashMap<string, TextCommand>();
-    internal Gee.List<ConversationAdditionPopulator> conversation_addition_populators = new ArrayList<ConversationAdditionPopulator>();
-    internal Gee.List<NotificationPopulator> notification_populators = new ArrayList<NotificationPopulator>();
-    internal Gee.Collection<ConversationTitlebarEntry> conversation_titlebar_entries = new Gee.TreeSet<ConversationTitlebarEntry>((a, b) => {
+    public ArrayList<EncryptionListEntry> encryption_list_entries = new ArrayList<EncryptionListEntry>();
+    public HashMap<string, CallEncryptionEntry> call_encryption_entries = new HashMap<string, CallEncryptionEntry>();
+    public ArrayList<AccountSettingsEntry> account_settings_entries = new ArrayList<AccountSettingsEntry>();
+    public ArrayList<ContactDetailsProvider> contact_details_entries = new ArrayList<ContactDetailsProvider>();
+    public Map<string, TextCommand> text_commands = new HashMap<string, TextCommand>();
+    public Gee.List<ConversationAdditionPopulator> conversation_addition_populators = new ArrayList<ConversationAdditionPopulator>();
+    public Gee.List<NotificationPopulator> notification_populators = new ArrayList<NotificationPopulator>();
+    public Gee.Collection<ConversationTitlebarEntry> conversation_titlebar_entries = new Gee.TreeSet<ConversationTitlebarEntry>((a, b) => {
         return (int)(a.order - b.order);
     });
     public VideoCallPlugin? video_call_plugin;
-- 
cgit v1.2.3