diff options
Diffstat (limited to 'plugins/omemo')
| -rw-r--r-- | plugins/omemo/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | plugins/omemo/meson.build | 3 | ||||
| -rw-r--r-- | plugins/omemo/src/ui/encryption_preferences_entry.vala | 24 |
3 files changed, 6 insertions, 26 deletions
diff --git a/plugins/omemo/CMakeLists.txt b/plugins/omemo/CMakeLists.txt index a8920d72..410d5712 100644 --- a/plugins/omemo/CMakeLists.txt +++ b/plugins/omemo/CMakeLists.txt @@ -3,7 +3,7 @@ find_package(Gettext) include(${GETTEXT_USE_FILE}) gettext_compile(${GETTEXT_PACKAGE} SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/po TARGET_NAME ${GETTEXT_PACKAGE}-translations) -find_package(Adwaita REQUIRED) +find_package(Adwaita ${Adwaita_GLOBAL_VERSION} REQUIRED) find_package(Qrencode REQUIRED) find_packages(OMEMO_PACKAGES REQUIRED Adwaita @@ -35,9 +35,6 @@ compile_gresources( SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data ) set(OMEMO_DEFINITIONS) -if(Adwaita_VERSION VERSION_GREATER_EQUAL "1.2") - set(OMEMO_DEFINITIONS ${OMEMO_DEFINITIONS} Adw_1_2) -endif() vala_precompile(OMEMO_VALA_C SOURCES diff --git a/plugins/omemo/meson.build b/plugins/omemo/meson.build index 315f69f4..05d7c265 100644 --- a/plugins/omemo/meson.build +++ b/plugins/omemo/meson.build @@ -65,8 +65,5 @@ 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/omemo/src/ui/encryption_preferences_entry.vala b/plugins/omemo/src/ui/encryption_preferences_entry.vala index 7997f04d..71cd68ec 100644 --- a/plugins/omemo/src/ui/encryption_preferences_entry.vala +++ b/plugins/omemo/src/ui/encryption_preferences_entry.vala @@ -155,15 +155,10 @@ public class OmemoPreferencesWidget : Adw.PreferencesGroup { copy_button.clicked.connect(() => { copy_button.get_clipboard().set_text(fingerprint); }); own_action_box.append(copy_button); - Adw.ActionRow action_row = new Adw.ActionRow(); - + Adw.ActionRow action_row = new Adw.ActionRow() { use_markup = true }; action_row.title = "This device"; - action_row.subtitle = format_fingerprint(fingerprint_from_base64(own_b64)); - action_row.add_suffix(own_action_box); -#if Adw_1_2 - action_row.use_markup = true; action_row.subtitle = fingerprint_markup(fingerprint_from_base64(own_b64)); -#endif + action_row.add_suffix(own_action_box); add_key_row(action_row); // Create and set QR code popover @@ -209,7 +204,7 @@ public class OmemoPreferencesWidget : Adw.PreferencesGroup { } if (device[plugin.db.identity_meta.now_active]) { - Adw.ActionRow action_row = new Adw.ActionRow(); + Adw.ActionRow action_row = new Adw.ActionRow() { use_markup = true }; action_row.activated.connect(() => { Row updated_device = plugin.db.identity_meta.get_device(device[plugin.db.identity_meta.identity_id], device[plugin.db.identity_meta.address_name], device[plugin.db.identity_meta.device_id]); ManageKeyDialog manage_dialog = new ManageKeyDialog(updated_device, plugin.db); @@ -222,7 +217,7 @@ public class OmemoPreferencesWidget : Adw.PreferencesGroup { }); action_row.activatable = true; action_row.title = "Other device"; - action_row.subtitle = format_fingerprint(fingerprint_from_base64(key_base64)); + action_row.subtitle = fingerprint_markup(fingerprint_from_base64(key_base64)); string trust_str = _("Accepted"); switch(trust) { case TrustLevel.UNTRUSTED: @@ -234,10 +229,6 @@ public class OmemoPreferencesWidget : Adw.PreferencesGroup { } action_row.add_suffix(new Label(trust_str)); -#if Adw_1_2 - action_row.use_markup = true; - action_row.subtitle = fingerprint_markup(fingerprint_from_base64(key_base64)); -#endif add_key_row(action_row); } displayed_ids.add(device[plugin.db.identity_meta.device_id]); @@ -281,14 +272,9 @@ public class OmemoPreferencesWidget : Adw.PreferencesGroup { } private void add_new_fingerprint(Row device) { - Adw.ActionRow action_row = new Adw.ActionRow(); + Adw.ActionRow action_row = new Adw.ActionRow() { use_markup = true }; action_row.title = _("New device"); - action_row.subtitle = format_fingerprint(fingerprint_from_base64(device[plugin.db.identity_meta.identity_key_public_base64])); - -#if Adw_1_2 - action_row.use_markup = true; action_row.subtitle = fingerprint_markup(fingerprint_from_base64(device[plugin.db.identity_meta.identity_key_public_base64])); -#endif Button accept_button = new Button() { visible = true, valign = Align.CENTER, hexpand = true }; accept_button.set_icon_name("emblem-ok-symbolic"); // using .image = sets .image-button. Together with .suggested/destructive action that breaks the button Adwaita |