From 21ae42762d8a57da5cb1ec40b46e7510fc3121ad Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 20 Jun 2024 12:05:20 +0200 Subject: Redesign and rewrite accounts and settings dialog into a combined one --- plugins/openpgp/data/account_settings_item.ui | 31 --------------------------- 1 file changed, 31 deletions(-) delete mode 100644 plugins/openpgp/data/account_settings_item.ui (limited to 'plugins/openpgp/data') diff --git a/plugins/openpgp/data/account_settings_item.ui b/plugins/openpgp/data/account_settings_item.ui deleted file mode 100644 index 56808be0..00000000 --- a/plugins/openpgp/data/account_settings_item.ui +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - label - - - 0 - 0 - - - 0 - - - - - - - - - entry - - - 1 - - - - - - \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 680f0dd0a768b201b62899905c38210e834dde91 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 20 Jun 2024 13:47:25 +0200 Subject: Fix meson build files --- main/data/gresource.xml | 1 - plugins/omemo/meson.build | 3 +++ plugins/openpgp/data/gresource.xml | 5 ++--- plugins/openpgp/meson.build | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'plugins/openpgp/data') diff --git a/main/data/gresource.xml b/main/data/gresource.xml index f436ce68..30d0e288 100644 --- a/main/data/gresource.xml +++ b/main/data/gresource.xml @@ -71,7 +71,6 @@ preferences_window_account.ui preferences_window_general.ui search_autocomplete.ui - settings_dialog.ui style-dark.css style.css unified_main_content.ui diff --git a/plugins/omemo/meson.build b/plugins/omemo/meson.build index 05d7c265..315f69f4 100644 --- a/plugins/omemo/meson.build +++ b/plugins/omemo/meson.build @@ -65,5 +65,8 @@ c_args = [ vala_args = [ '--vapidir', meson.current_source_dir() / 'vapi', ] +if dep_libadwaita.version() == 'unknown' or dep_libadwaita.version().version_compare('>=1.2') + vala_args += ['-D', 'Adw_1_2'] +endif lib_omemo = shared_library('omemo', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, include_directories: include_directories('src'), dependencies: dependencies, install: true, install_dir: get_option('libdir') / 'dino/plugins') dep_omemo = declare_dependency(link_with: lib_omemo, include_directories: include_directories('.')) diff --git a/plugins/openpgp/data/gresource.xml b/plugins/openpgp/data/gresource.xml index fbe2e8e9..75f25e67 100644 --- a/plugins/openpgp/data/gresource.xml +++ b/plugins/openpgp/data/gresource.xml @@ -1,6 +1,5 @@ - - account_settings_item.ui - + + diff --git a/plugins/openpgp/meson.build b/plugins/openpgp/meson.build index ec6f5c0e..ad1614d6 100644 --- a/plugins/openpgp/meson.build +++ b/plugins/openpgp/meson.build @@ -14,6 +14,7 @@ sources = files( 'src/contact_details_provider.vala', 'src/database.vala', 'src/encryption_list_entry.vala', + 'src/encryption_preferences_entry.vala', 'src/file_transfer/file_decryptor.vala', 'src/file_transfer/file_encryptor.vala', 'src/gpgme_fix.c', -- cgit v1.2.3-70-g09d2