From 55a5b6f242e7ca5f257a085c722f6cc9fa055b04 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Mon, 7 Oct 2024 16:55:27 +0900 Subject: dbus: use name resolved by exec.Command Signed-off-by: Ophestra Umiker --- internal/app/share.dbus.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'internal') diff --git a/internal/app/share.dbus.go b/internal/app/share.dbus.go index b1be631f..d26534a1 100644 --- a/internal/app/share.dbus.go +++ b/internal/app/share.dbus.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "os" - "os/exec" "path" "git.ophivana.moe/cat/fortify/acl" @@ -16,13 +15,10 @@ import ( const ( dbusSessionBusAddress = "DBUS_SESSION_BUS_ADDRESS" dbusSystemBusAddress = "DBUS_SYSTEM_BUS_ADDRESS" - - xdgDBusProxy = "xdg-dbus-proxy" ) var ( ErrDBusConfig = errors.New("dbus config not supplied") - ErrDBusProxy = errors.New(xdgDBusProxy + " not found") ) type ( @@ -68,13 +64,8 @@ func (seal *appSeal) shareDBus(config [2]*dbus.Config) error { systemBus[0] = addr } - // look up proxy program path for dbus.New - if b, err := exec.LookPath(xdgDBusProxy); err != nil { - return (*LookupDBusError)(wrapError(ErrDBusProxy, xdgDBusProxy, "not found")) - } else { - // create proxy instance - seal.sys.dbus = dbus.New(b, sessionBus, systemBus) - } + // create proxy instance + seal.sys.dbus = dbus.New(sessionBus, systemBus) // seal dbus proxy if err := seal.sys.dbus.Seal(config[0], config[1]); err != nil { -- cgit v1.3.1