Skip to content

chore: rename deepin-kwin to kwin #125

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
wineee merged 2 commits into from
Apr 1, 2025
Merged

chore: rename deepin-kwin to kwin #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d84ba6
chore: rename deepin-kwin to kwin
wineee Mar 14, 2025
4fec76b
chore: bump version to 1.99.12
wineee Mar 24, 2025
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: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
dde-session (1.99.12) unstable; urgency=medium

* rename deepin-kwin to kwin

-- rewine <luhongxu@uniontech.com> Mon, 24 Mar 2025 10:33:39 +0800

dde-session (1.99.11) unstable; urgency=medium

* fix: return value spelling error
Expand Down
4 changes: 2 additions & 2 deletions src/dde-session/othersmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void OthersManager::launchWmChooser()
}

// kwin存在的情况
if (!QStandardPaths::findExecutable("deepin-kwin_x11").isEmpty() && QFile(config).exists()) {
if (!QStandardPaths::findExecutable("kwin_x11").isEmpty() && QFile(config).exists()) {
QFile configFile(config);
if (!configFile.open(QIODevice::ReadOnly)) {
qWarning() << "failed to open file: " << config;
Expand All @@ -64,7 +64,7 @@ void OthersManager::launchWmChooser()
bool compositingEnabled = (lastWm == "deepin-wm");

// 更新kwinrc的配置文件
const QString &kwinRc = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/deepin-kwinrc";
const QString &kwinRc = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/kwinrc";
QSettings settings(kwinRc, QSettings::IniFormat);
settings.beginGroup("Compositing");
settings.setValue("Enabled", compositingEnabled);
Expand Down
2 changes: 1 addition & 1 deletion systemd/dde-session-pre.target.wants/dde-session@x11.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Type=notify
# Only start if the template instance matches the session type.
ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
ExecStartPre=-/bin/sh -c 'cp -n /etc/xdg/kglobalshortcutsrc $HOME/.config/kglobalshortcutsrc'
ExecStart=/usr/bin/deepin-kwin_x11 --replace
ExecStart=/usr/bin/kwin_x11 --replace
# Exit code 1 means we are probably *not* dealing with an extension failure
SuccessExitStatus=1

Expand Down
Loading