Skip to content

Commit cdd0c61

Browse files
committed
chore: remove xsettings module
Removed the xsettings module completely from the dde-daemon project. This includes deleting all xsettings-related source files, test files, configuration files, and removing xsettings from module registration and dependency lists. The display module no longer depends on xsettings. This change was made because the xsettings functionality is being deprecated or moved to a different component, making the current implementation obsolete. Influence: 1. Verify that the system still boots properly without xsettings 2. Test display functionality to ensure it works independently 3. Check that no other modules break due to xsettings removal 4. Verify that xsettings-related configuration files are no longer present 5. Test system theme and scaling settings through alternative mechanisms 6. Ensure cursor theme and size settings work through other components chore: 移除 xsettings 模块 从 dde-daemon 项目中完全移除了 xsettings 模块。这包括删除所有 xsettings 相关的源文件、测试文件、配置文件,以及从模块注册和依赖列表中移除 xsettings。显示模块不再依赖 xsettings。进行此更改是因为 xsettings 功能正 在被弃用或移动到其他组件,使得当前实现变得过时。 Influence: 1. 验证系统在没有 xsettings 的情况下仍能正常启动 2. 测试显示功能确保其能独立工作 3. 检查是否有其他模块因 xsettings 移除而出现问题 4. 验证 xsettings 相关的配置文件不再存在 5. 通过其他机制测试系统主题和缩放设置 6. 确保光标主题和大小设置通过其他组件正常工作 PMS: TASK-381269
1 parent 86a5a5d commit cdd0c61

21 files changed

Lines changed: 1 addition & 2654 deletions

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ TEST = \
8888
${GOPKG_PREFIX}/x_event_monitor1 \
8989
${GOPKG_PREFIX}/bin/default-file-manager \
9090
${GOPKG_PREFIX}/display1 \
91-
${GOPKG_PREFIX}/xsettings1
9291
#${GOPKG_PREFIX}/timedate1/zoneinfo \
9392
9493
BINARIES = \

bin/dde-session-daemon/daemon.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ func (s *SessionDaemon) register(service *dbusutil.Service) error {
177177

178178
func (s *SessionDaemon) initModules() {
179179
part1ModuleNames := []string{
180-
"xsettings",
181180
"display",
182181
"trayicon",
183182
"x-event-monitor",

bin/dde-session-daemon/module.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
_ "github.com/linuxdeepin/dde-daemon/timedate1"
3636
_ "github.com/linuxdeepin/dde-daemon/trayicon1"
3737
_ "github.com/linuxdeepin/dde-daemon/x_event_monitor1"
38-
_ "github.com/linuxdeepin/dde-daemon/xsettings1"
3938
)
4039

4140
var (

display1/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func NewModule(logger *log.Logger) *daemon {
3434
}
3535

3636
func (*daemon) GetDependencies() []string {
37-
return []string{"xsettings"}
37+
return []string{}
3838
}
3939

4040
var _mainBeginTime time.Time

misc/dsg-configs/org.deepin.XSettings.json

Lines changed: 0 additions & 352 deletions
This file was deleted.

0 commit comments

Comments
 (0)