Show which account is currently used in conversation details in the about sectionadd_conversation_account_indicator

4 files changed, 26 insertions, 1 deletions

diff --git a/crypto-vala/CMakeLists.txt b/crypto-vala/CMakeLists.txt
index f1f3f9d7..6dec5292 100644
--- a/crypto-vala/CMakeLists.txt
+++ b/crypto-vala/CMakeLists.txt
@@ -14,7 +14,7 @@ SOURCES
     "src/random.vala"
     "src/srtp.vala"
 CUSTOM_VAPIS
-    "${CMAKE_CURRENT_SOURCE_DIR}/vapi/gcrypt.vapi"
+    "${CMAKE_CURRENT_SOURCE_DIR}/vapi/libgcrypt.vapi"
     "${CMAKE_CURRENT_SOURCE_DIR}/vapi/libsrtp2.vapi"
 PACKAGES
     ${CRYPTO_VALA_PACKAGES}
diff --git a/crypto-vala/crypto-vala.deps b/crypto-vala/crypto-vala.deps
new file mode 100644
index 00000000..c029e7af
--- /dev/null
+++ b/crypto-vala/crypto-vala.deps
@@ -0,0 +1,2 @@
+gio-2.0
+glib-2.0
diff --git a/crypto-vala/meson.build b/crypto-vala/meson.build
new file mode 100644
index 00000000..c3feb4d1
--- /dev/null
+++ b/crypto-vala/meson.build
@@ -0,0 +1,23 @@
+dependencies = [
+    dep_gio,
+    dep_glib,
+    dep_libgcrypt,
+    dep_libsrtp2,
+]
+sources = files(
+    'src/cipher.vala',
+    'src/cipher_converter.vala',
+    'src/error.vala',
+    'src/random.vala',
+    'src/srtp.vala',
+)
+c_args = [
+    '-DG_LOG_DOMAIN="crypto-vala"',
+]
+vala_args = [
+    '--vapidir', meson.current_source_dir() / 'vapi',
+]
+lib_crypto_vala = library('crypto-vala', sources, c_args: c_args, vala_args: vala_args, dependencies: dependencies, version: '0.0', install: true, install_dir: [true, true, true])
+dep_crypto_vala = declare_dependency(link_with: lib_crypto_vala, include_directories: include_directories('.'))
+
+install_data('crypto-vala.deps', install_dir: get_option('datadir') / 'vala/vapi') # TODO: workaround for https://github.com/mesonbuild/meson/issues/9756
diff --git a/crypto-vala/vapi/gcrypt.vapi b/crypto-vala/vapi/libgcrypt.vapi
index 0fa69a02..0fa69a02 100644
--- a/crypto-vala/vapi/gcrypt.vapi
+++ b/crypto-vala/vapi/libgcrypt.vapi