Skip to content

Commit 2c7a78f

Browse files
committed
chore: rename deepin-kwin to kwin
Log: refork kwin form uos, don't rename
1 parent ac499e0 commit 2c7a78f

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/dde-session/othersmanager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void OthersManager::launchWmChooser()
4444
}
4545

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

6666
// 更新kwinrc的配置文件
67-
const QString &kwinRc = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/deepin-kwinrc";
67+
const QString &kwinRc = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/kwinrc";
6868
QSettings settings(kwinRc, QSettings::IniFormat);
6969
settings.beginGroup("Compositing");
7070
settings.setValue("Enabled", compositingEnabled);

systemd/dde-session-pre.target.wants/dde-session@x11.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Type=notify
2222
# Only start if the template instance matches the session type.
2323
ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
2424
ExecStartPre=-/bin/sh -c 'cp -n /etc/xdg/kglobalshortcutsrc $HOME/.config/kglobalshortcutsrc'
25-
ExecStart=/usr/bin/deepin-kwin_x11 --replace
25+
ExecStart=/usr/bin/kwin_x11 --replace
2626
# Exit code 1 means we are probably *not* dealing with an extension failure
2727
SuccessExitStatus=1
2828

0 commit comments

Comments
 (0)