Skip to content

chore: remove dde-desktop #100

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
zsien merged 1 commit into from
Nov 28, 2024
Merged

chore: remove dde-desktop #100

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
7 changes: 0 additions & 7 deletions src/dde-session/impl/sessionmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ void SessionManager::prepareLogout(bool force)
stopRedshift();
stopObexService();
stopDock();
stopDesktop();

// 防止注销时，蓝牙音频设置没有断开连接
disconnectAudioDevices();
Expand Down Expand Up @@ -649,12 +648,6 @@ void SessionManager::stopDock()
VIEW_SERVICE(DDE_DOCK_SERVICE);
}

void SessionManager::stopDesktop()
{
STOP_SERVICE(DDE_DESKTOP_SERVICE);
VIEW_SERVICE(DDE_DESKTOP_SERVICE);
}

void SessionManager::disconnectAudioDevices()
{
auto msg = QDBusInterface("org.deepin.dde.Bluetooth1"
Expand Down
1 change: 0 additions & 1 deletion src/dde-session/impl/sessionmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ public Q_SLOTS:
void stopBAMFDaemon();
void stopRedshift();
void stopDock();
void stopDesktop();
void disconnectAudioDevices();

void preparePlayShutdownSound();
Expand Down
1 change: 0 additions & 1 deletion src/utils/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#define BAMFDAEMON_SERVICE "bamfdaemon.service"
#define REDSHIFT_SERVICE "redshift.service"
#define DDE_DOCK_SERVICE "dde-dock.service"
#define DDE_DESKTOP_SERVICE "dde-desktop.service"

// sound
#define SOUND_EFFECT_SCHEMA "com.deepin.dde.sound-effect"
Expand Down
2 changes: 0 additions & 2 deletions systemd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ set(DDE_SESSION_PRE_WANTS
# dde-session-initialized.target.wants - TODO: 暂时先放这里，后续应该转移到对应服务
install(DIRECTORY DESTINATION lib/systemd/user/dde-session-initialized.target.wants/)
set(DDE_SESSION_INITIALIZED_WANTS
dde-session-initialized.target.wants/dde-desktop.service
dde-session-initialized.target.wants/dde-shell@DDE.service
dde-session-initialized.target.wants/dde-lock.service
dde-session-initialized.target.wants/dde-polkit-agent.service
Expand All @@ -39,7 +38,6 @@ install(FILES ${DDE_SESSION_PRE_WANTS} DESTINATION lib/systemd/user/)
install(FILES ${DDE_SESSION_INITIALIZED_WANTS} DESTINATION lib/systemd/user/)
install_symlink(dde-session@x11.service dde-session-pre.target.wants)
install_symlink(dde-display.service dde-session-pre.target.wants)
install_symlink(dde-desktop.service dde-session-initialized.target.wants)
install_symlink(dde-shell@DDE.service dde-session-initialized.target.wants)
install_symlink(dde-lock.service dde-session-initialized.target.wants)
install_symlink(dde-polkit-agent.service dde-session-initialized.target.wants)
Expand Down
26 changes: 0 additions & 26 deletions systemd/dde-session-initialized.target.wants/dde-desktop.service
View file
Open in desktop

This file was deleted.