From ec4ca2a4642552b8424e7703840cd37e371e9e00 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Sun, 4 Oct 2026 16:32:47 +0200 Subject: Only try loading the plugin when actually enabled --- main/meson.build | 3 +++ main/src/main.vala | 6 ++++++ 2 files changed, 9 insertions(+) (limited to 'main') diff --git a/main/meson.build b/main/meson.build index b3047fb1..cdefcbf7 100644 --- a/main/meson.build +++ b/main/meson.build @@ -170,6 +170,7 @@ if get_option('rtp').allowed() and dep_gstreamer.found() and dep_gstreamer_app.f if get_option('rtp-vp9') vala_args += ['-D', 'ENABLE_VP9'] endif + vala_args += ['-D', 'WITH_RTP'] summary('Voice/video calls (rtp)', true, bool_yn: true, section: 'Plugins') summary('H264 codec', get_option('rtp-h264'), bool_yn: true, section: 'RTP configuration') @@ -215,6 +216,7 @@ if get_option('omemo').allowed() and dep_libomemo_c.found() and dep_libqrencode. 'src/plugins/omemo/ui/own_notifications.vala', 'src/plugins/omemo/ui/util.vala', ) + vala_args += ['-D', 'WITH_OMEMO'] summary('End-to-end encryption using OMEMO (omemo)', true, bool_yn: true, section: 'Plugins') else @@ -240,6 +242,7 @@ if get_option('openpgp').allowed() and dep_gpgme.found() 'src/plugins/openpgp/util.vala', 'vapi/gpg-error.vapi', ) + vala_args += ['-D', 'WITH_OPENPGP'] summary('End-to-end encryption using PGP (openpgp)', true, bool_yn: true, section: 'Plugins') else diff --git a/main/src/main.vala b/main/src/main.vala index d683b5d8..63c553fc 100644 --- a/main/src/main.vala +++ b/main/src/main.vala @@ -20,9 +20,15 @@ void main(string[] args) { if (Environment.get_variable("DINO_PLUGINS_LOAD_ALL") == "1") { loader.load_all(); } +#if WITH_RTP loader.load_type(typeof(Plugins.Rtp.Plugin)); +#endif +#if WITH_OPENPGP loader.load_type(typeof(Plugins.OpenPgp.Plugin)); +#endif +#if WITH_OMEMO loader.load_type(typeof(Plugins.Omemo.Plugin)); +#endif app.run(args); loader.shutdown(); -- cgit v1.3