Update to work with latest main pulled in

Author: Jacalz

openuri/opendir.go

@@ -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"
@@ -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
 }

openuri/openfile.go

@@ -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"
@@ -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
 }

trash/trash.go

@@ -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"
 )

trash/trashfile.go

@@ -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.
@@ -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