From b0456e13ed35e6ebf684b3a7f4d1cb4b6ec352cc Mon Sep 17 00:00:00 2001 From: Marvin W Date: Sat, 22 Aug 2026 19:03:26 +0200 Subject: Move crypto-vala inside libdino --- plugins/omemo/meson.build | 5 ++--- plugins/omemo/src/file_transfer/file_decryptor.vala | 2 +- plugins/omemo/src/file_transfer/file_encryptor.vala | 2 +- plugins/omemo/src/jingle/jet_omemo.vala | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) (limited to 'plugins/omemo') diff --git a/plugins/omemo/meson.build b/plugins/omemo/meson.build index d195525e..978fb9a6 100644 --- a/plugins/omemo/meson.build +++ b/plugins/omemo/meson.build @@ -1,7 +1,6 @@ subdir('po') dependencies = [ dep_libadwaita, - dep_crypto_vala, dep_dino, dep_gee, dep_glib, @@ -61,10 +60,10 @@ c_args = vala_c_args + [ '-DGETTEXT_PACKAGE="dino-omemo"', '-DLOCALE_INSTALL_DIR="@0@"'.format(get_option('prefix') / get_option('localedir')), ] -if crypto_backend == 'gnutls' +if crypto_backend == 'gnu' dependencies += [ dep_libgcrypt ] sources += files('src/native/helper_gcrypt.c') -else +elif crypto_backend == 'openssl' dependencies += [ dep_openssl ] sources += files('src/native/helper_openssl.c') endif diff --git a/plugins/omemo/src/file_transfer/file_decryptor.vala b/plugins/omemo/src/file_transfer/file_decryptor.vala index ff96b4a3..8ae0b96b 100644 --- a/plugins/omemo/src/file_transfer/file_decryptor.vala +++ b/plugins/omemo/src/file_transfer/file_decryptor.vala @@ -1,6 +1,6 @@ using Dino.Entities; -using Crypto; +using Dino.Crypto; using Omemo; namespace Dino.Plugins.Omemo { diff --git a/plugins/omemo/src/file_transfer/file_encryptor.vala b/plugins/omemo/src/file_transfer/file_encryptor.vala index 1aed752f..5f1d6e69 100644 --- a/plugins/omemo/src/file_transfer/file_encryptor.vala +++ b/plugins/omemo/src/file_transfer/file_encryptor.vala @@ -1,7 +1,7 @@ using Gee; using Gtk; -using Crypto; +using Dino.Crypto; using Dino.Entities; using Xmpp; using Omemo; diff --git a/plugins/omemo/src/jingle/jet_omemo.vala b/plugins/omemo/src/jingle/jet_omemo.vala index b1a27e15..8a84d3d2 100644 --- a/plugins/omemo/src/jingle/jet_omemo.vala +++ b/plugins/omemo/src/jingle/jet_omemo.vala @@ -1,4 +1,4 @@ -using Crypto; +using Dino.Crypto; using Dino; using Dino.Entities; using Gee; -- cgit v1.3