diff options
| author | saturneric <[email protected]> | 2024-04-11 19:55:57 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-04-11 19:56:05 +0000 |
| commit | e6be01ca8fdce75b2c1d5be32e0a00d4bda29b8d (patch) | |
| tree | ac51625707d1c7d97c123ae3c58c8653e859dcd8 /src/core | |
| parent | refactor: reduce core prebuild headers and isolate core to modules (diff) | |
| download | GpgFrontend-e6be01ca8fdce75b2c1d5be32e0a00d4bda29b8d.tar.gz GpgFrontend-e6be01ca8fdce75b2c1d5be32e0a00d4bda29b8d.zip | |
fix: find and solve some issues on module management
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/GpgCoreInit.cpp | 10 | ||||
| -rw-r--r-- | src/core/function/gpg/GpgAdvancedOperator.cpp | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/core/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp index 8268f798..8b2dbbed 100644 --- a/src/core/GpgCoreInit.cpp +++ b/src/core/GpgCoreInit.cpp @@ -415,12 +415,12 @@ void InitGpgFrontendCore(CoreInitArgs args) { Module::UpsertRTValue("core", "env.state.basic", 1); CoreSignalStation::GetInstance()->SignalGoodGnupgEnv(); - // if gnupg-info-gathering module activated + // if gnupg_info_gathering module activated if (args.gather_external_gnupg_info && Module::IsModuleAcivate("com.bktus.gpgfrontend.module." - "integrated.gnupg-info-gathering")) { + "integrated.gnupg_info_gathering")) { GF_CORE_LOG_DEBUG( - "module gnupg-info-gathering is activated, " + "module gnupg_info_gathering is activated, " "loading external gnupg info..."); // gather external gnupg info @@ -438,7 +438,7 @@ void InitGpgFrontendCore(CoreInitArgs args) { "com.bktus.gpgfrontend.module.integrated.gnupg-info-" "gathering") { GF_CORE_LOG_DEBUG( - "received callback from gnupg-info-gathering "); + "received callback from gnupg_info_gathering "); // try to restart all components auto settings = @@ -460,7 +460,7 @@ void InitGpgFrontendCore(CoreInitArgs args) { } }); } else { - GF_CORE_LOG_DEBUG("gnupg-info-gathering is not activated"); + GF_CORE_LOG_DEBUG("gnupg_info_gathering is not activated"); Module::UpsertRTValue("core", "env.state.all", 1); } return 0; diff --git a/src/core/function/gpg/GpgAdvancedOperator.cpp b/src/core/function/gpg/GpgAdvancedOperator.cpp index 3fc831ed..6e67bfb7 100644 --- a/src/core/function/gpg/GpgAdvancedOperator.cpp +++ b/src/core/function/gpg/GpgAdvancedOperator.cpp @@ -140,12 +140,12 @@ void GpgFrontend::GpgAdvancedOperator::ResetConfigures(OperationCallback cb) { void GpgFrontend::GpgAdvancedOperator::StartGpgAgent(OperationCallback cb) { const auto gpg_agent_path = Module::RetrieveRTValueTypedOrDefault<>( - "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering", + "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering", "gnupg.gpg_agent_path", QString{}); GF_CORE_LOG_DEBUG("got gnupg agent path from rt: {}", gpg_agent_path); const auto home_path = Module::RetrieveRTValueTypedOrDefault<>( - "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering", + "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering", "gnupg.home_path", QString{}); GF_CORE_LOG_DEBUG("got gnupg home path from rt: {}", home_path); @@ -165,12 +165,12 @@ void GpgFrontend::GpgAdvancedOperator::StartGpgAgent(OperationCallback cb) { void GpgFrontend::GpgAdvancedOperator::StartDirmngr(OperationCallback cb) { const auto dirmngr_path = Module::RetrieveRTValueTypedOrDefault<>( - "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering", + "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering", "gnupg.dirmngr_path", QString{}); GF_CORE_LOG_DEBUG("got gnupg dirmngr path from rt: {}", dirmngr_path); const auto home_path = Module::RetrieveRTValueTypedOrDefault<>( - "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering", + "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering", "gnupg.home_path", QString{}); GF_CORE_LOG_DEBUG("got gnupg home path from rt: {}", home_path); @@ -190,12 +190,12 @@ void GpgFrontend::GpgAdvancedOperator::StartDirmngr(OperationCallback cb) { void GpgFrontend::GpgAdvancedOperator::StartKeyBoxd(OperationCallback cb) { const auto keyboxd_path = Module::RetrieveRTValueTypedOrDefault<>( - "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering", + "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering", "gnupg.keyboxd_path", QString{}); GF_CORE_LOG_DEBUG("got gnupg keyboxd path from rt: {}", keyboxd_path); const auto home_path = Module::RetrieveRTValueTypedOrDefault<>( - "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering", + "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering", "gnupg.home_path", QString{}); GF_CORE_LOG_DEBUG("got gnupg home path from rt: {}", home_path); |