From f11877c00cf4f201ca7004a6313fccf53e052e79 Mon Sep 17 00:00:00 2001
From: zhangkun <zhangkun2@uniontech.com>
Date: Fri, 10 Jul 2026 10:39:25 +0800
Subject: [PATCH] fix(xsettings): restrict service to X11 session only
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. Add ExecCondition to XSettings service to skip on Wayland sessions
2. Add session type condition to plugin JSON for X11-only loading

Log: Restrict the XSettings plugin and service to X11 session only

fix(xsettings): 限制服务仅在 X11 会话下运行

1. 为 XSettings 服务添加 ExecCondition，在 Wayland 会话时跳过启动
2. 为插件 JSON 添加 sessionType 条件，仅 X11 下加载

Log: 限制 XSettings 插件和服务仅在 X11 会话下运行
PMS: BUG-367635
---
 src/plugin-qt/xsettings/misc/org.deepin.dde.XSettings1.service | 1 +
 src/plugin-qt/xsettings/misc/plugin-dde-xsettings.json         | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/plugin-qt/xsettings/misc/org.deepin.dde.XSettings1.service b/src/plugin-qt/xsettings/misc/org.deepin.dde.XSettings1.service
index 8533883..c054aab 100644
--- a/src/plugin-qt/xsettings/misc/org.deepin.dde.XSettings1.service
+++ b/src/plugin-qt/xsettings/misc/org.deepin.dde.XSettings1.service
@@ -3,6 +3,7 @@ Description=org.deepin.dde.XSettings1
 RefuseManualStart=no
 RefuseManualStop=no
 CollectMode=inactive-or-failed
+ConditionEnvironment=XDG_SESSION_TYPE=x11
 
 PartOf=dde-session-pre.target
 Before=dde-session-pre.target
diff --git a/src/plugin-qt/xsettings/misc/plugin-dde-xsettings.json b/src/plugin-qt/xsettings/misc/plugin-dde-xsettings.json
index f659af9..109b681 100644
--- a/src/plugin-qt/xsettings/misc/plugin-dde-xsettings.json
+++ b/src/plugin-qt/xsettings/misc/plugin-dde-xsettings.json
@@ -3,6 +3,9 @@
   "libPath": "libplugin-dde-xsettings.so",
   "startType": "Resident",
   "pluginType": "qt",
+  "condition": {
+    "sessionType": "x11"
+  },
   "policy": [
     {
       "path": "/org/deepin/dde/XSettings1"