rosa/hakurei
6
3
Fork 2
Code Issues 10 Pull Requests 2 Actions 2 Packages Projects Releases 15 Wiki Activity

hst/dbus: move dbus config struct
Some checks failed
Test / Create distribution (push) Failing after 26s
Details
Test / Sandbox (race detector) (push) Failing after 42s
Details
Test / Sandbox (push) Failing after 42s
Details
Test / Hakurei (race detector) (push) Failing after 49s
Details
Test / Hakurei (push) Failing after 49s
Details
Test / Hpkg (push) Failing after 46s
Details
Test / Flake checks (push) Has been skipped
Details

Browse Source 
This allows holding a xdg-dbus-proxy configuration without importing system/dbus.

It also makes more sense in the project structure since the config struct is part of the hst API however the rest of the implementation is not.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2025-10-07 19:01:18 +09:00
parent 3ce63e95d7
commit be194272d9
9 changed files with 143 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system/dispatcher.go
View File

@@ -6,6 +6,7 @@ import (
"log"
"os"
"hakurei.app/hst"
"hakurei.app/system/acl"
"hakurei.app/system/dbus"
"hakurei.app/system/internal/xcb"
@@ -50,7 +51,7 @@ type syscallDispatcher interface {
// dbusAddress provides [dbus.Address].
dbusAddress() (session, system string)
// dbusFinalise provides [dbus.Finalise].
dbusFinalise(sessionBus, systemBus dbus.ProxyPair, session, system *dbus.Config) (final *dbus.Final, err error)
dbusFinalise(sessionBus, systemBus dbus.ProxyPair, session, system *hst.BusConfig) (final *dbus.Final, err error)
// dbusProxyStart provides the Start method of [dbus.Proxy].
dbusProxyStart(proxy *dbus.Proxy) error
// dbusProxyClose provides the Close method of [dbus.Proxy].
@@ -85,7 +86,7 @@ func (k direct) dbusAddress() (session, system string) {
return dbus.Address()
}
func (k direct) dbusFinalise(sessionBus, systemBus dbus.ProxyPair, session, system *dbus.Config) (final *dbus.Final, err error) {
func (k direct) dbusFinalise(sessionBus, systemBus dbus.ProxyPair, session, system *hst.BusConfig) (final *dbus.Final, err error) {
return dbus.Finalise(sessionBus, systemBus, session, system)
}