File not-set-all-environment.patch of Package deepin-session

Overview Repositories Revisions Requests Users Attributes Meta

File not-set-all-environment.patch of Package deepin-session (Revision 295eff7c0e46cee5d3389e8112b981c5)

Currently displaying revision 295eff7c0e46cee5d3389e8112b981c5 , Show latest

From 14c49a590d065b6b51267fb104f1007680e0ba75 Mon Sep 17 00:00:00 2001
From: justforlxz <justforlxz@gmail.com>
Date: Tue, 19 Sep 2023 13:27:41 +0800
Subject: [PATCH] fix: not set all environment to systemd and dbus

As the session leader, dde-session needs to process its own environment variables
and update them to systemd, so that programs started through systemd can
obtain the correct environment variables.
---
 src/dde-session/environmentsmanager.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/dde-session/environmentsmanager.cpp b/src/dde-session/environmentsmanager.cpp
index ca5387c..bca1b04 100644
--- a/src/dde-session/environmentsmanager.cpp
+++ b/src/dde-session/environmentsmanager.cpp
@@ -75,12 +75,17 @@ void EnvironmentsManager::init()
 void EnvironmentsManager::createGenernalEnvironments()
 {
     double scaleFactor = Utils::SettingValue("com.deepin.xsettings", QByteArray(), "scale-factor", 1.0).toDouble();
-    m_envMap = {
-        {"GNOME_DESKTOP_SESSION_ID", "this-is-deprecated"},
-        {"XDG_CURRENT_DESKTOP", "DDE"},
-        {"QT_DBL_CLICK_DIST", QString::number(15 * scaleFactor)},
-        {"QT_LINUX_ACCESSIBILITY_ALWAYS_ON", "1"},
-    };
+    auto envs = QProcessEnvironment::systemEnvironment();
+    auto keys = envs.keys();
+
+    for (const auto& key : keys) {
+        m_envMap.insert(key, envs.value(key));
+    }
+
+    m_envMap.insert("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
+    m_envMap.insert("XDG_CURRENT_DESKTOP", "DDE");
+    m_envMap.insert("QT_DBL_CLICK_DIST", QString::number(15 * scaleFactor));
+    m_envMap.insert("QT_LINUX_ACCESSIBILITY_ALWAYS_ON", "1");
 
     // 浮点数相等
     if (qFuzzyIsNull(scaleFactor - 1.0)) {

Places

File not-set-all-environment.patch of Package deepin-session (Revision 295eff7c0e46cee5d3389e8112b981c5)

Places