diff options
| author | saturneric <[email protected]> | 2024-01-26 08:28:16 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-01-26 08:28:16 +0000 |
| commit | d57558edfa1eece6b7a60869d8e78e6ae813a091 (patch) | |
| tree | d2f80bf2f511536f1dfecb3cd1381362e0da398b | |
| parent | fix: export libarchive and libgtest to artifacts (diff) | |
| download | GpgFrontend-d57558edfa1eece6b7a60869d8e78e6ae813a091.tar.gz GpgFrontend-d57558edfa1eece6b7a60869d8e78e6ae813a091.zip | |
fix: slove some discovered issues on windows
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/core/GpgCoreInit.cpp | 4 | ||||
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/gnupg/GnuPGControllerDialog.cpp | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6876ecf5..6a7cf4a8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -267,6 +267,10 @@ if (BUILD_APPLICATION) file(GLOB _libDllPath "${_libDllBinPath}/libcrypto-*.dll") list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath}) + unset(_libDllPath) + file(GLOB _libDllPath "${_libDllBinPath}/libxml2-*.dll") + list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath}) + # gpgme-w32spawn.exe unset(_libExEPath) file(GLOB _libExEPath "${_libDllBinPath}/gpgme-w32spawn.exe") diff --git a/src/core/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp index a126c87e..d2e4c2ec 100644 --- a/src/core/GpgCoreInit.cpp +++ b/src/core/GpgCoreInit.cpp @@ -225,7 +225,7 @@ auto DetectGpgConfPath() -> QString { auto use_custom_gnupg_install_path = settings.value("gnupg/use_custom_gnupg_install_path", false).toBool(); auto custom_gnupg_install_path = - settings.value("basic/custom_gnupg_install_path", QString{}).toString(); + settings.value("gnupg/custom_gnupg_install_path", QString{}).toString(); QString gnupg_install_fs_path; // user defined @@ -315,7 +315,7 @@ void InitGpgFrontendCore(CoreInitArgs args) { .toString(); auto custom_gnupg_install_path = - settings.value("basic/custom_gnupg_install_path", QString{}) + settings.value("gnupg/custom_gnupg_install_path", QString{}) .toString(); auto use_pinentry_as_password_input_dialog = diff --git a/src/init.cpp b/src/init.cpp index 313097a8..76c1fd4c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -81,7 +81,7 @@ void InitGlobalPathEnv() { QString custom_gnupg_install_path = GlobalSettingStation::GetInstance() .GetSettings() - .value("basic/custom_gnupg_install_path") + .value("gnupg/custom_gnupg_install_path") .toString(); // add custom gnupg install path into env $PATH diff --git a/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp b/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp index 8a4db995..ffe8d3af 100644 --- a/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp +++ b/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp @@ -238,7 +238,7 @@ void GnuPGControllerDialog::slot_update_custom_gnupg_install_path_label( QString custom_gnupg_install_path = GlobalSettingStation::GetInstance() .GetSettings() - .value("basic/custom_gnupg_install_path") + .value("gnupg/custom_gnupg_install_path") .toString(); GF_UI_LOG_DEBUG("custom_gnupg_install_path from settings: {}", custom_gnupg_install_path); @@ -333,10 +333,10 @@ void GnuPGControllerDialog::apply_settings() { ui_->gpgmeDebugLogCheckBox->isChecked()); settings.setValue("gnupg/custom_key_database_path", ui_->currentKeyDatabasePathLabel->text()); - settings.setValue("basic/custom_gnupg_install_path", + settings.setValue("gnupg/custom_gnupg_install_path", ui_->currentCustomGnuPGInstallPathLabel->text()); settings.setValue("gnupg/restart_gpg_agent_on_start", - ui_->restartGpgAgentOnStartCheckBox->text()); + ui_->restartGpgAgentOnStartCheckBox->isChecked()); } int GnuPGControllerDialog::get_restart_needed() const { |