Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temporarily neutralize the host app registry #1628

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions doc/api-reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,8 @@ API Reference
Portal interfaces are available to sandboxed applications with the default
filtered session bus access of Flatpak.

Desktop portals appear under the bus name ``org.freedesktop.portal.Desktop``
and the object path ``/org/freedesktop/portal/desktop`` on the session bus,
unless specified otherwise.

Apps running on the host system have access to a special interface for
registering themselves with XDG Desktop Portal. Registering a host app with
XDG Desktop Portal overwrites the automatic detection based on the
`XDG cgroup pathname standardization for applications
<https://systemd.io/DESKTOP_ENVIRONMENTS/#xdg-standardization-for-applications>`_.
This might improve the user experience when the host app was launched in a way
that doesn't follow the standard. See
:doc:`org.freedesktop.host.portal.Registry <doc-org.freedesktop.host.portal.Registry>`

All apps have access to the portals below:
Unless otherwise specified, they appear under the bus name ``org.freedesktop.portal.Desktop``
and the object path ``/org/freedesktop/portal/desktop`` on the session bus.

.. toctree::
:maxdepth: 1
Expand Down
2 changes: 0 additions & 2 deletions doc/fix-rst-dbus.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ def adjust_title(lines):
adjusted_title = title.replace("org.freedesktop.portal.", "")
elif title.startswith("org.freedesktop.impl.portal"):
adjusted_title = title.replace("org.freedesktop.impl.portal.", "")
elif title.startswith("org.freedesktop.host.portal"):
adjusted_title = title.replace("org.freedesktop.host.portal.", "")
elif title.startswith("org.freedesktop.background.Monitor"):
adjusted_title = title.replace(
"org.freedesktop.background.Monitor", "Background Apps Monitor"
Expand Down
3 changes: 0 additions & 3 deletions doc/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ if build_documentation
foreach i: portal_sources
all_interfaces_xml += i
endforeach
foreach i: portal_host_sources
all_interfaces_xml += i
endforeach
foreach i: portal_impl_sources
all_interfaces_xml += i
endforeach
Expand Down
2 changes: 1 addition & 1 deletion src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ xdg_desktop_portal_sources = files(
'print.c',
'proxy-resolver.c',
'realtime.c',
'registry.c',
#'registry.c',
'remote-desktop.c',
'screen-cast.c',
'screenshot.c',
Expand Down
6 changes: 6 additions & 0 deletions src/xdg-desktop-portal.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@
#include "print.h"
#include "proxy-resolver.h"
#include "realtime.h"
#if 0
#include "registry.h"
#endif
#include "remote-desktop.h"
#include "xdp-request.h"
#include "screen-cast.h"
Expand Down Expand Up @@ -188,6 +190,7 @@ export_portal_implementation (GDBusConnection *connection,
g_debug ("providing portal %s", g_dbus_interface_skeleton_get_info (skeleton)->name);
}

#if 0
static void
export_host_portal_implementation (GDBusConnection *connection,
GDBusInterfaceSkeleton *skeleton)
Expand All @@ -214,6 +217,7 @@ export_host_portal_implementation (GDBusConnection *connection,

g_debug ("providing portal %s", g_dbus_interface_skeleton_get_info (skeleton)->name);
}
#endif

static void
peer_died_cb (const char *name)
Expand Down Expand Up @@ -401,7 +405,9 @@ on_bus_acquired (GDBusConnection *connection,
xdp_usb_create (connection, implementation->dbus_name));
#endif

#if 0
export_host_portal_implementation (connection, registry_create (connection));
#endif
}

static void
Expand Down
2 changes: 1 addition & 1 deletion tests/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ pytest_files = [
'test_openuri.py',
'test_permission_store.py',
'test_print.py',
'test_registry.py',
#'test_registry.py',
'test_remotedesktop.py',
'test_settings.py',
'test_screenshot.py',
Expand Down
Loading