Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
dominichayesferen authored Jan 25, 2024
2 parents 3fd2f18 + fd70f57 commit d54ce3e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ This documentation is made up of the following sections:
reasons to use portals on your apps.
* :doc:`Common conventions <common-conventions>`: coding patterns and principles
common when **app and desktop developers** are working with portal APIs.
* :doc:`Application API <application-api>`: portal APIs that **apps** can use to
* :doc:`Application API <api-reference>`: portal APIs that **apps** can use to
interact with the host system.
* :doc:`Portal backends <backends>`: interfaces and configuration files that
**desktop developers** can implement and install in order to write a portal
Expand Down
2 changes: 1 addition & 1 deletion doc/window-identifiers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ For example, ``x11:1234``.

Under Wayland, it should have the form ``wayland:<HANDLE>``, where ``<HANDLE>``
is a surface handle obtained with the `xdg_foreign
<https://github.com/wayland-project/wayland-protocols/blob/master/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml>`_
<https://gitlab.freedesktop.org/wayland/wayland-protocols/-/blob/main/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml>`_
protocol. For example, ``wayland:~12l9jdl.-a``.

For other windowing systems, or if you don't have a suitable handle, just pass
Expand Down
8 changes: 4 additions & 4 deletions document-portal/document-portal-fuse.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
* referenced by the dcache (Directory Entry Cache) (even though we
* will not really use the dcache info due to the 0 valid time). This
* is unfortunate, because it means we will keep a lot of file
* descriptor open. But, we can not know if the kernel needs the inode
* descriptors open. But, we can not know if the kernel needs the inode
* for some non-dcache use so we can't close the file descriptors.
*
* To work around this we regularly emit entry invalidation calls
Expand Down Expand Up @@ -947,7 +947,7 @@ verify_doc_dir_devino (int dirfd, XdpDomain *doc_domain)
return -ENOENT;

return 0;
}
}

/* Only for toplevel dirs, not this is a bit weird for toplevel dir
inodes as it returns the dir itself which isn't really the dirfd
Expand Down Expand Up @@ -1659,7 +1659,7 @@ ensure_docdir_inode (XdpInode *parent,
inode->domain_root_inode = xdp_inode_ref (parent->domain_root_inode);
else
inode->domain_root_inode = xdp_inode_ref (parent);
g_hash_table_insert (domain->inodes, physical, inode);
g_hash_table_insert (domain->inodes, physical, inode);
}
G_UNLOCK(domain_inodes);

Expand Down Expand Up @@ -2360,7 +2360,7 @@ xdp_fuse_opendir (fuse_req_t req,
}
}

fi->fh = (gsize)d;
fi->fh = (gsize)d;

if (fuse_reply_open (req, fi) == -ENOENT)
{
Expand Down

0 comments on commit d54ce3e

Please sign in to comment.