diff options
| -rw-r--r-- | main/data/gresource.xml | 1 | ||||
| -rw-r--r-- | plugins/omemo/meson.build | 3 | ||||
| -rw-r--r-- | plugins/openpgp/data/gresource.xml | 5 | ||||
| -rw-r--r-- | plugins/openpgp/meson.build | 1 |
4 files changed, 6 insertions, 4 deletions
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 @@ <file>preferences_window_account.ui</file> <file>preferences_window_general.ui</file> <file>search_autocomplete.ui</file> - <file>settings_dialog.ui</file> <file>style-dark.css</file> <file>style.css</file> <file>unified_main_content.ui</file> 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 @@ <?xml version="1.0" encoding="UTF-8"?> <gresources> - <gresource prefix="/im/dino/Dino/openpgp"> - <file>account_settings_item.ui</file> - </gresource> +<!-- <gresource prefix="/im/dino/Dino/openpgp">--> +<!-- </gresource>--> </gresources> 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', |