From 21ae42762d8a57da5cb1ec40b46e7510fc3121ad Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Thu, 20 Jun 2024 12:05:20 +0200
Subject: Redesign and rewrite accounts and settings dialog into a combined one

---
 plugins/openpgp/CMakeLists.txt | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'plugins/openpgp/CMakeLists.txt')

diff --git a/plugins/openpgp/CMakeLists.txt b/plugins/openpgp/CMakeLists.txt
index 6ed7bf53..d2ac6d73 100644
--- a/plugins/openpgp/CMakeLists.txt
+++ b/plugins/openpgp/CMakeLists.txt
@@ -7,6 +7,7 @@ gettext_compile(${GETTEXT_PACKAGE} SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/po TAR
 
 
 find_packages(OPENPGP_PACKAGES REQUIRED
+    Adwaita
     Gee
     GLib
     GModule
@@ -14,19 +15,10 @@ find_packages(OPENPGP_PACKAGES REQUIRED
     GTK4
 )
 
-set(RESOURCE_LIST
-    account_settings_item.ui
-)
-
-compile_gresources(
-    OPENPGP_GRESOURCES_TARGET
-    OPENPGP_GRESOURCES_XML
-    TARGET ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c
-    TYPE EMBED_C
-    RESOURCES ${RESOURCE_LIST}
-    PREFIX /im/dino/Dino/openpgp
-    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data
-)
+set(OPENPGP_DEFINITIONS)
+if(Adwaita_VERSION VERSION_GREATER_EQUAL "1.4")
+    set(OPENPGP_DEFINITIONS ${OPENPGP_DEFINITIONS} Adw_1_4)
+endif()
 
 vala_precompile(OPENPGP_VALA_C
 SOURCES
@@ -35,10 +27,10 @@ SOURCES
     src/file_transfer/file_decryptor.vala
     src/file_transfer/file_encryptor.vala
 
-    src/account_settings_entry.vala
     src/contact_details_provider.vala
     src/database.vala
     src/encryption_list_entry.vala
+    src/encryption_preferences_entry.vala
     src/manager.vala
     src/plugin.vala
     src/register_plugin.vala
@@ -53,12 +45,12 @@ CUSTOM_VAPIS
     ${CMAKE_BINARY_DIR}/exports/dino.vapi
 PACKAGES
     ${OPENPGP_PACKAGES}
-GRESOURCES
-    ${OPENPGP_GRESOURCES_XML}
+DEFINITIONS
+    ${OPENPGP_DEFINITIONS}
 )
 
 add_definitions(${VALA_CFLAGS} -DG_LOG_DOMAIN="OpenPGP" -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\")
-add_library(openpgp SHARED ${OPENPGP_VALA_C} ${OPENPGP_GRESOURCES_TARGET} src/gpgme_fix.c)
+add_library(openpgp SHARED ${OPENPGP_VALA_C} src/gpgme_fix.c)
 add_dependencies(openpgp ${GETTEXT_PACKAGE}-translations)
 target_include_directories(openpgp PRIVATE src)
 target_link_libraries(openpgp libdino gpgme ${OPENPGP_PACKAGES})
-- 
cgit v1.2.3-70-g09d2