From d5e3fc96bde6befd42e3a8aed387b8300c768263 Mon Sep 17 00:00:00 2001
From: yeshanshan <yeshanshan@uniontech.com>
Date: Wed, 20 Aug 2025 12:26:36 +0800
Subject: [PATCH] fix: set DSG_DATA_DIRS for linglong compatibility
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added DSG_DATA_DIRS environment variable setting in both dde-dconfig-
editor and dde-dconfig main functions
The variable is set to include both standard path (/usr/share/dsg) and
linglong container path (/var/lib/linglong/entries/share/dsg)
This ensures dconfig applications can access configuration files in both
standard and linglong environments
Maintains compatibility with dde-dconfig-daemon which already uses this
environment variable

fix: 为玲珑兼容性设置 DSG_DATA_DIRS 环境变量

在 dde-dconfig-editor 和 dde-dconfig 的主函数中添加了 DSG_DATA_DIRS 环境
变量设置
该变量包含标准路径 (/usr/share/dsg) 和玲珑容器路径 (/var/lib/linglong/
entries/share/dsg)
确保配置应用程序能够在标准环境和玲珑环境中访问配置文件
与已使用此环境变量的 dde-dconfig-daemon 保持兼容性
---
 dconfig-center/dde-dconfig-editor/main.cpp | 2 ++
 dconfig-center/dde-dconfig/main.cpp        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/dconfig-center/dde-dconfig-editor/main.cpp b/dconfig-center/dde-dconfig-editor/main.cpp
index df99e9d..9c09a7a 100644
--- a/dconfig-center/dde-dconfig-editor/main.cpp
+++ b/dconfig-center/dde-dconfig-editor/main.cpp
@@ -13,6 +13,8 @@ DWIDGET_USE_NAMESPACE
 
 int main(int argc, char *argv[])
 {
+    setenv("DSG_DATA_DIRS", "/usr/share/dsg:/var/lib/linglong/entries/share/dsg", 0);
+
     DApplication a(argc, argv);
     a.setApplicationVersion(VERSION);
     a.setApplicationName("dde-dconfig-editor");
diff --git a/dconfig-center/dde-dconfig/main.cpp b/dconfig-center/dde-dconfig/main.cpp
index cad29f8..d7f08d3 100644
--- a/dconfig-center/dde-dconfig/main.cpp
+++ b/dconfig-center/dde-dconfig/main.cpp
@@ -372,6 +372,8 @@ int CommandManager::watchCommand()
 
 int main(int argc, char *argv[])
 {
+    setenv("DSG_DATA_DIRS", "/usr/share/dsg:/var/lib/linglong/entries/share/dsg", 0);
+
     QCoreApplication a(argc, argv);
     a.setApplicationVersion(VERSION);