Skip to content

feat(session): add XDG_CONFIG_DIRS with /usr/share/kwin/xdg fallback #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
justforlxz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(session): add XDG_CONFIG_DIRS with /usr/share/kwin/xdg fallback #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions misc/profile.d/deepin-xdg-dir.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CONFIG_HOME="$HOME/.config"
export XDG_CACHE_HOME="$HOME/.cache"
export XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS:-/etc/xdg}:/usr/share/kwin/xdg"

#export XDG_DESKTOP_DIR="$HOME/Desktop"
#export XDG_DOCUMENTS_DIR="$HOME/Documents"
Expand Down
10 changes: 10 additions & 0 deletions src/dde-session/environmentsmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,16 @@ void EnvironmentsManager::createGeneralEnvironments()
m_envMap.insert("XDG_CURRENT_DESKTOP", "DDE");
m_envMap.insert("QT_DBL_CLICK_DIST", QString::number(15 * scaleFactor));

{
QString xdgConfigDirs = m_envMap.value("XDG_CONFIG_DIRS");
if (xdgConfigDirs.isEmpty()) {
xdgConfigDirs = QStringLiteral("/etc/xdg:/usr/share/kwin/xdg");
} else {
xdgConfigDirs += QStringLiteral(":/usr/share/kwin/xdg");
}
m_envMap.insert("XDG_CONFIG_DIRS", xdgConfigDirs);
}

if (sessionType == "x11") {
m_envMap.insert("QT_QPA_PLATFORM", "dxcb;xcb");
} else if (sessionType == "wayland") {
Expand Down
Loading