diff --git a/bin/dde-session-daemon/main.go b/bin/dde-session-daemon/main.go index db3f5e93e..078bbcdef 100755 --- a/bin/dde-session-daemon/main.go +++ b/bin/dde-session-daemon/main.go @@ -41,7 +41,7 @@ var logger = log.NewLogger("daemon/dde-session-daemon") var hasDDECookie bool var hasTreeLand bool -var treeLandNotAllowModules = []string{"x-event-monitor", "keybinding", "trayicon", "screensaver"} +var treeLandNotAllowModules = []string{"x-event-monitor", "keybinding", "screensaver"} func isInShutdown() bool { bus, err := dbus.SystemBus() diff --git a/go.mod b/go.mod index 36926be72..2944c7f98 100644 --- a/go.mod +++ b/go.mod @@ -7,14 +7,14 @@ require ( github.com/adrg/xdg v0.5.3 github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394 github.com/davecgh/go-spew v1.1.1 - github.com/fsnotify/fsnotify v1.7.0 + github.com/fsnotify/fsnotify v1.8.0 github.com/godbus/dbus/v5 v5.1.0 github.com/gosexy/gettext v0.0.0-20160830220431-74466a0a0c4a github.com/jouyouyun/hardware v0.1.8 - github.com/linuxdeepin/dde-api v0.0.0-20240902063014-bac87797f4c3 - github.com/linuxdeepin/go-dbus-factory v0.0.0-20241114095502-09e43c651aea + github.com/linuxdeepin/dde-api v0.0.0-20241128100002-d1fb4aa471f5 + github.com/linuxdeepin/go-dbus-factory v0.0.0-20241205055755-b43db97ea584 github.com/linuxdeepin/go-gir v0.0.0-20230710064042-bd15f0549c87 - github.com/linuxdeepin/go-lib v0.0.0-20240105075242-dddda54ea9f0 + github.com/linuxdeepin/go-lib v0.0.0-20241205060835-186e3626ee51 github.com/linuxdeepin/go-x11-client v0.0.0-20240415051504-c8e43d028ff9 github.com/mdlayher/netlink v1.7.2 github.com/msteinert/pam v1.2.0 @@ -41,7 +41,7 @@ require ( github.com/zaf/g711 v0.0.0-20220109202201-cf0017bf0359 // indirect golang.org/x/image v0.10.0 // indirect golang.org/x/net v0.27.0 // indirect - golang.org/x/sync v0.8.0 // indirect + golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.26.0 // indirect - golang.org/x/text v0.17.0 // indirect + golang.org/x/text v0.21.0 // indirect ) diff --git a/go.sum b/go.sum index 484cebca1..6997a1d36 100644 --- a/go.sum +++ b/go.sum @@ -10,8 +10,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= +github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -32,15 +32,15 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/linuxdeepin/dde-api v0.0.0-20240902063014-bac87797f4c3 h1:SlPsz953m6CeFoawhtL5S/3huF0s4PtPxiTeIp7CKIw= -github.com/linuxdeepin/dde-api v0.0.0-20240902063014-bac87797f4c3/go.mod h1:Ms92CRDOjzkDmX1x0x6+b0vQSYHJ7Ab9jQMY2JYWiio= -github.com/linuxdeepin/go-dbus-factory v0.0.0-20241114095502-09e43c651aea h1:ysK5BolL/6OCf/4RmgrMFwT1frLRYlv0FGutA+xtRNk= -github.com/linuxdeepin/go-dbus-factory v0.0.0-20241114095502-09e43c651aea/go.mod h1:iIlTR50SA8MJ9ORPyMOpKWMF4g+AUorbER5AX0RD9Jk= +github.com/linuxdeepin/dde-api v0.0.0-20241128100002-d1fb4aa471f5 h1:0OFQ7rwwGOAo45rluOYH7cOMBoBdXis4h1oFNyLteO4= +github.com/linuxdeepin/dde-api v0.0.0-20241128100002-d1fb4aa471f5/go.mod h1:Ms92CRDOjzkDmX1x0x6+b0vQSYHJ7Ab9jQMY2JYWiio= +github.com/linuxdeepin/go-dbus-factory v0.0.0-20241205055755-b43db97ea584 h1:LA2Nnk+rFgw1cSTpFLVpZk1o9VxYjLz9w8pVXGgDwVU= +github.com/linuxdeepin/go-dbus-factory v0.0.0-20241205055755-b43db97ea584/go.mod h1:iIlTR50SA8MJ9ORPyMOpKWMF4g+AUorbER5AX0RD9Jk= github.com/linuxdeepin/go-gir v0.0.0-20230331033513-a8d7a9e89f9b/go.mod h1:a0tox5vepTQu5iO6rdKc4diGT+fkyXZlRROM8ULEvaI= github.com/linuxdeepin/go-gir v0.0.0-20230710064042-bd15f0549c87 h1:ga3ioifiDJJDfWv0ZJPX8e//fQNIzINXxJb4BMQofOo= github.com/linuxdeepin/go-gir v0.0.0-20230710064042-bd15f0549c87/go.mod h1:a0tox5vepTQu5iO6rdKc4diGT+fkyXZlRROM8ULEvaI= -github.com/linuxdeepin/go-lib v0.0.0-20240105075242-dddda54ea9f0 h1:GKCg/0gMMMbQUBvZiGFeEp/xeFTWmBeee+a77viyO3I= -github.com/linuxdeepin/go-lib v0.0.0-20240105075242-dddda54ea9f0/go.mod h1:yNoMFao1mE45M8zW6i83eaGpT9eriCWsXEdcVNQswpw= +github.com/linuxdeepin/go-lib v0.0.0-20241205060835-186e3626ee51 h1:UoYODyk5/VAeXWzXESySHRzqdzNRjBLPtdodVz5wuLc= +github.com/linuxdeepin/go-lib v0.0.0-20241205060835-186e3626ee51/go.mod h1:yNoMFao1mE45M8zW6i83eaGpT9eriCWsXEdcVNQswpw= github.com/linuxdeepin/go-x11-client v0.0.0-20220830090948-78fe92b727bb/go.mod h1:KwpmRZ47A/0a2l9V0V6aTlkuNaqy5j1fOqMFJONuIMY= github.com/linuxdeepin/go-x11-client v0.0.0-20240415051504-c8e43d028ff9 h1:GbhdC1TMi+V5yMRlfl16Y2gT/nhJn2OJalw6sVbFRHQ= github.com/linuxdeepin/go-x11-client v0.0.0-20240415051504-c8e43d028ff9/go.mod h1:KwpmRZ47A/0a2l9V0V6aTlkuNaqy5j1fOqMFJONuIMY= @@ -99,8 +99,8 @@ golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -119,8 +119,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= diff --git a/trayicon1/daemon.go b/trayicon1/daemon.go index 760d9af27..ef7ea31b8 100644 --- a/trayicon1/daemon.go +++ b/trayicon1/daemon.go @@ -5,9 +5,9 @@ package trayicon import ( + "github.com/godbus/dbus/v5" "os" - dbus "github.com/godbus/dbus/v5" "github.com/linuxdeepin/dde-daemon/loader" "github.com/linuxdeepin/go-lib/dbusutil" "github.com/linuxdeepin/go-lib/log" @@ -39,16 +39,7 @@ func (d *Daemon) Name() string { func (d *Daemon) Start() error { var err error - // init x conn - XConn, err = x.NewConn() - if err != nil { - return err - } - - initX() service := loader.GetService() - d.manager = NewTrayManager(service) - sessionBus, err := dbus.SessionBus() if err != nil { return err @@ -57,24 +48,36 @@ func (d *Daemon) Start() error { d.sigLoop = dbusutil.NewSignalLoop(sessionBus, 10) d.sigLoop.Start() - err = service.Export(dbusPath, d.manager) - if err != nil { - return err - } + if os.Getenv("XDG_SESSION_TYPE") != "wayland" { + // init x conn + XConn, err = x.NewConn() + if err != nil { + return err + } - err = d.manager.sendClientMsgMANAGER() - if err != nil { - return err - } + initX() - err = service.RequestName(dbusServiceName) - if err != nil { - return err - } + d.manager = NewTrayManager(service) - err = service.Emit(d.manager, "Inited") - if err != nil { - return err + err = service.Export(dbusPath, d.manager) + if err != nil { + return err + } + + err = d.manager.sendClientMsgMANAGER() + if err != nil { + return err + } + + err = service.RequestName(dbusServiceName) + if err != nil { + return err + } + + err = service.Emit(d.manager, "Inited") + if err != nil { + return err + } } if os.Getenv("DDE_DISABLE_STATUS_NOTIFIER_WATCHER") != "1" {