4 files changed, 16 insertions, 7 deletions
diff --git a/src/cmd.cpp b/src/cmd.cpp
index d56f1c8a..89a0be95 100644
--- a/src/cmd.cpp
+++ b/src/cmd.cpp
@@ -35,14 +35,13 @@
 #include <qtextstream.h>
 
 #include "core/GpgCoreInit.h"
-#include "core/model/SettingsObject.h"
 #include "core/module/ModuleManager.h"
-#include "core/struct/settings_object/KeyDatabaseListSO.h"
 #include "core/utils/BuildInfoUtils.h"
 
 // GpgFrontend
 
 #include "GpgFrontendContext.h"
+#include "core/utils/GpgUtils.h"
 #include "test/GpgFrontendTest.h"
 
 namespace GpgFrontend {
@@ -80,6 +79,8 @@ auto PrintEnvInfo() -> int {
   stream << Tr("OpenSSL Version: ") << GetProjectOpenSSLVersion() << '\n';
   stream << Tr("Libarchive Version: ") << GetProjectLibarchiveVersion() << '\n';
 
+
+
   stream << '\n';
 
   stream << Tr("GnuPG: ") << '\n';
@@ -150,12 +151,9 @@ auto PrintEnvInfo() -> int {
   stream << "Key Database(s): " << '\n';
   stream << '\n';
 
-  auto key_database_list =
-      KeyDatabaseListSO(SettingsObject("key_database_list"));
-  const auto key_databases = key_database_list.key_databases;
-
   int index = 0;
-  for (const auto& key_database : key_databases) {
+  auto key_dbs = GetGpgKeyDatabaseInfos();
+  for (const auto& key_database : key_dbs) {
     stream << Tr("Key Database [") << index++ << "] " << Tr("Name: ")
            << key_database.name << " " << Tr("-> Path: ") << key_database.path
            << '\n';
diff --git a/src/core/struct/settings_object/KeyDatabaseItemSO.h b/src/core/struct/settings_object/KeyDatabaseItemSO.h
index 4f6020d7..873246b2 100644
--- a/src/core/struct/settings_object/KeyDatabaseItemSO.h
+++ b/src/core/struct/settings_object/KeyDatabaseItemSO.h
@@ -29,6 +29,7 @@
 #pragma once
 
 #include "core/model/KeyDatabaseInfo.h"
+
 namespace GpgFrontend {
 
 struct KeyDatabaseItemSO {
diff --git a/src/core/utils/BuildInfoUtils.cpp b/src/core/utils/BuildInfoUtils.cpp
index cb738c3c..43d8b71d 100644
--- a/src/core/utils/BuildInfoUtils.cpp
+++ b/src/core/utils/BuildInfoUtils.cpp
@@ -29,6 +29,7 @@
 #include "BuildInfoUtils.h"
 
 #include <archive.h>
+#include <gpgme.h>
 #include <openssl/opensslv.h>
 
 #include "GpgFrontendBuildInfo.h"
@@ -59,6 +60,8 @@ auto GetProjectQtVersion() -> QString { return {qVersion()}; }
 
 auto GetProjectOpenSSLVersion() -> QString { return {OPENSSL_VERSION_TEXT}; }
 
+auto GetProjectGpgMEVersion() -> QString { return {GPGME_VERSION}; }
+
 auto GetProjectLibarchiveVersion() -> QString {
   return {ARCHIVE_VERSION_ONLY_STRING};
 }
diff --git a/src/core/utils/BuildInfoUtils.h b/src/core/utils/BuildInfoUtils.h
index 66954094..33d922f1 100644
--- a/src/core/utils/BuildInfoUtils.h
+++ b/src/core/utils/BuildInfoUtils.h
@@ -107,6 +107,13 @@ auto GPGFRONTEND_CORE_EXPORT GetProjectLibarchiveVersion() -> QString;
  *
  * @return QString
  */
+auto GPGFRONTEND_CORE_EXPORT GetProjectGpgMEVersion() -> QString;
+
+/**
+ * @brief
+ *
+ * @return QString
+ */
 auto GPGFRONTEND_CORE_EXPORT GetHttpRequestUserAgent() -> QString;
 
 }  // namespace GpgFrontend
 \ No newline at end of file