Skip to content

feat: move dde-session-shell.conf to /var/lib/dde-session-shell for V25 #74

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

Merged
Ivy233 merged 1 commit into from
Jul 14, 2026
+13 −5
Merged

feat: move dde-session-shell.conf to /var/lib/dde-session-shell for V25 #74

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
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,11 @@ else ()
endif ()

# install conf files
install(FILES files/dde-session-shell.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/dde-session-shell/)
if (DDE_SESSION_SHELL_SNIPE)
install(FILES files/dde-session-shell.conf DESTINATION /var/lib/dde-session-shell/)
else()
install(FILES files/dde-session-shell.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/dde-session-shell/)
endif()
install(FILES files/lightdm-deepin-greeter.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/deepin-authentication/privileges/)

# services
Expand Down
6 changes: 5 additions & 1 deletion src/global_util/constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2015 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2015 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -38,7 +38,11 @@ static const int MIN_AUTH_WIDGET_HEIGHT = 276; // 密码验证时整个登录控
const QStringList session_ui_configs {
"/etc/lightdm/lightdm-deepin-greeter.conf",
"/etc/deepin/dde-session-ui.conf",
#ifdef ENABLE_DSS_SNIPE
"/var/lib/dde-session-shell/dde-session-shell.conf",
#else
"/usr/share/dde-session-shell/dde-session-shell.conf",
#endif
"/usr/share/dde-session-ui/dde-session-ui.conf"
};

Expand Down
6 changes: 3 additions & 3 deletions src/lightdm-deepin-greeter/logintipswindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2011 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2011 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -39,7 +39,7 @@ void LoginTipsWindow::initUI()
m_content->setAlignment(Qt::AlignCenter);
m_content->setTextFormat(Qt::TextFormat::PlainText);

// 获取/usr/share/dde-session-shell/dde-session-shell.conf 配置信息
// 获取 session_ui_configs 中的 dde-session-shell.conf 配置信息
m_contentString = findValueByQSettings<QString>(DDESESSIONCC::session_ui_configs, "Greeter", "tipsContent", "");
m_content->setText(m_contentString);

Expand All @@ -58,7 +58,7 @@ void LoginTipsWindow::initUI()
m_tipLabel->setAlignment(Qt::AlignCenter);
m_tipLabel->setTextFormat(Qt::TextFormat::PlainText);

// 获取/usr/share/dde-session-shell/dde-session-shell.conf 配置信息
// 获取 session_ui_configs 中的 dde-session-shell.conf 配置信息
m_tipString = findValueByQSettings<QString>(DDESESSIONCC::session_ui_configs, "Greeter", "tipsTitle", "");
m_tipLabel->setText(m_tipString);

Expand Down
Loading