Skip to content

Commit 9c46abe

Browse files
committed
chore: trayicon1 no longer register itself as tray selection manager
不再由 dde-daemon 的 trayicon1 模块注册 selectionmanager Log:
1 parent b009d00 commit 9c46abe

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

trayicon1/daemon.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ func (d *Daemon) Start() error {
4848
d.sigLoop = dbusutil.NewSignalLoop(sessionBus, 10)
4949
d.sigLoop.Start()
5050

51-
if os.Getenv("XDG_SESSION_TYPE") != "wayland" {
52-
// init x conn
51+
// Enable this on both x11 and wayland(for xwayland support)
52+
// #region init x conn
53+
var enableTraySelectionManager = false
54+
if os.Getenv("XDG_SESSION_TYPE") != "wayland" && enableTraySelectionManager {
5355
XConn, err = x.NewConn()
5456
if err != nil {
5557
return err
@@ -79,6 +81,7 @@ func (d *Daemon) Start() error {
7981
return err
8082
}
8183
}
84+
// #endregion
8285

8386
if os.Getenv("DDE_DISABLE_STATUS_NOTIFIER_WATCHER") != "1" {
8487
d.snw = newStatusNotifierWatcher(service, d.sigLoop)

0 commit comments

Comments
 (0)