Skip to content

Commit

Permalink
Update to work with latest main pulled in
Browse files Browse the repository at this point in the history
  • Loading branch information
Jacalz committed Mar 15, 2024
1 parent f2bf627 commit 5a07210
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions openuri/opendir.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package openuri

import (
"github.com/godbus/dbus/v5"
"github.com/rymdport/portal"
"github.com/rymdport/portal/internal/apis"
)

const openDirCallName = openURIBaseName + ".OpenDirectory"
Expand All @@ -16,7 +16,7 @@ func OpenDirectory(parentWindow string, fd uintptr) error {

data := map[string]dbus.Variant{}

obj := conn.Object(portal.ObjectName, portal.ObjectPath)
obj := conn.Object(apis.ObjectName, apis.ObjectPath)
call := obj.Call(openDirCallName, 0, parentWindow, dbus.UnixFDIndex(fd), data)
return call.Err
}
4 changes: 2 additions & 2 deletions openuri/openfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package openuri

import (
"github.com/godbus/dbus/v5"
"github.com/rymdport/portal"
"github.com/rymdport/portal/internal/apis"
)

const openFileCallName = openURIBaseName + ".OpenFile"
Expand All @@ -16,7 +16,7 @@ func OpenFile(parentWindow string, fd uintptr) error {

data := map[string]dbus.Variant{}

obj := conn.Object(portal.ObjectName, portal.ObjectPath)
obj := conn.Object(apis.ObjectName, apis.ObjectPath)
call := obj.Call(openFileCallName, 0, parentWindow, dbus.UnixFDIndex(fd), data)
return call.Err
}
4 changes: 2 additions & 2 deletions trash/trash.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Package trash lets sandboxed applications send files to the trashcan.
package trash

import "github.com/rymdport/portal"
import "github.com/rymdport/portal/internal/apis"

const (
trashBaseName = portal.CallBaseName + ".Trash"
trashBaseName = apis.CallBaseName + ".Trash"
trashCallName = trashBaseName + ".TrashFile"
)
4 changes: 2 additions & 2 deletions trash/trashfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package trash

import (
"github.com/godbus/dbus/v5"
"github.com/rymdport/portal"
"github.com/rymdport/portal/internal/apis"
)

// TrashFile sends a file to the trashcan. Applications are allowed to trash a file if they can open it in r/w mode.
Expand All @@ -14,7 +14,7 @@ func TrashFile(fd uintptr) (uint8, error) {

data := map[string]dbus.Variant{}

obj := conn.Object(portal.ObjectName, portal.ObjectPath)
obj := conn.Object(apis.ObjectName, apis.ObjectPath)
call := obj.Call(trashCallName, 0, dbus.UnixFDIndex(fd), data)
if call.Err != nil {
return 0, err
Expand Down

0 comments on commit 5a07210

Please sign in to comment.