rpms/xdg-desktop-portal
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch for org.freedesktop.FileManager1 deadlock (#2020371)

Browse Source
This commit is contained in:
Aleksei Bavshin 2021-11-09 01:19:02 -08:00
parent 73b7d69617
commit 41ac86b605
No known key found for this signature in database
GPG Key ID: 4F071603387A382A
2 changed files with 121 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
open-uri-Avoid-calling-into-o.fd.FileManager1-during-startup.patch Normal file
View File

@ -0,0 +1,115 @@
From d7622e15ff8fef114a6759dde564826d04215a9f Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Thu, 30 Sep 2021 12:00:51 +0100
Subject: [PATCH] open-uri: Avoid calling into o.fd.FileManager1 during startup
Making a synchronous call into a GTK implementation of o.fd.FileManager1
can cause a deadlock, because GtkApplication makes a synchronous call
into the Inhibit portal when started in a non-GNOME, non-XFCE environment.
In this situation, each service does not take its bus name (and hence
complete service-activation) until it gets a reply from the other, which
obviously can't work.
We don't actually need a GDBusProxy here: we don't need to subscribe to
any signals, watch any properties or hold any state, so it's just as
straightforward to use g_dbus_connection_call_sync() on a just-in-time
basis.
The indentation is deliberately a bit odd here, to avoid a large
diffstat from re-indentation; it will be fixed in a subsequent commit.
Fixes: 69961f3f "openuri: Use FileManager1 in OpenDirectory"
Resolves: https://github.com/flatpak/xdg-desktop-portal/issues/636
Signed-off-by: Simon McVittie <smcv@collabora.com>
---
src/open-uri.c | 50 ++++++++++++++++++++++++--------------------------
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/src/open-uri.c b/src/open-uri.c
index bc53dbf..5c70715 100644
--- a/src/open-uri.c
+++ b/src/open-uri.c
@@ -60,8 +60,6 @@ typedef struct _OpenURIClass OpenURIClass;
struct _OpenURI
{
XdpOpenURISkeleton parent_instance;
-
- GDBusProxy* file_manager;
};
struct _OpenURIClass
@@ -689,7 +687,6 @@ handle_open_in_thread_func (GTask *task,
{
g_autofree char *real_path = get_real_path_for_doc_path (path, app_id);
- if (open_uri->file_manager != NULL)
{
/* Try opening the directory via the file manager interface, then
fall back to a plain URI open */
@@ -697,21 +694,36 @@ handle_open_in_thread_func (GTask *task,
g_autoptr(GVariant) result = NULL;
g_autoptr(GVariantBuilder) uris_builder = NULL;
g_autofree char* item_uri = g_filename_to_uri (real_path, NULL, NULL);
+ g_autoptr(GDBusConnection) bus = NULL;
+
+ bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &local_error);
uris_builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
g_variant_builder_add (uris_builder, "s", item_uri);
- result = g_dbus_proxy_call_sync (open_uri->file_manager,
- FILE_MANAGER_SHOW_ITEMS,
- g_variant_new ("(ass)", uris_builder, ""),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- &local_error);
+ if (bus)
+ result = g_dbus_connection_call_sync (bus,
+ FILE_MANAGER_DBUS_NAME,
+ FILE_MANAGER_DBUS_PATH,
+ FILE_MANAGER_DBUS_IFACE,
+ FILE_MANAGER_SHOW_ITEMS,
+ g_variant_new ("(ass)", uris_builder, ""),
+ NULL, /* ignore returned type */
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ &local_error);
+
if (result == NULL)
{
- g_warning ("Failed to call " FILE_MANAGER_SHOW_ITEMS ": %s",
- local_error->message);
+ if (g_error_matches (local_error, G_DBUS_ERROR,
+ G_DBUS_ERROR_NAME_HAS_NO_OWNER) ||
+ g_error_matches (local_error, G_DBUS_ERROR,
+ G_DBUS_ERROR_SERVICE_UNKNOWN))
+ g_debug ("No " FILE_MANAGER_DBUS_NAME " available");
+ else
+ g_warning ("Failed to call " FILE_MANAGER_SHOW_ITEMS ": %s",
+ local_error->message);
}
else
{
@@ -1079,20 +1091,6 @@ open_uri_create (GDBusConnection *connection,
g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (impl), G_MAXINT);
open_uri = g_object_new (open_uri_get_type (), NULL);
- open_uri->file_manager = g_dbus_proxy_new_sync (connection,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL,
- FILE_MANAGER_DBUS_NAME,
- FILE_MANAGER_DBUS_PATH,
- FILE_MANAGER_DBUS_IFACE,
- NULL,
- &error);
- if (!open_uri->file_manager)
- {
- g_debug ("Failed to create FileManager proxy: %s", error->message);
- // Missing FileManager1 errors should be non-fatal.
- g_clear_error (&error);
- }
monitor = g_app_info_monitor_get ();

7
xdg-desktop-portal.spec
View File

@ -5,13 +5,15 @@
Name: xdg-desktop-portal Name: xdg-desktop-portal
Version: 1.10.1 Version: 1.10.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Portal frontend service to flatpak Summary: Portal frontend service to flatpak
License: LGPLv2+ License: LGPLv2+
URL: https://github.com/flatpak/xdg-desktop-portal/ URL: https://github.com/flatpak/xdg-desktop-portal/
Source0: https://github.com/flatpak/xdg-desktop-portal/releases/download/%{version}/%{name}-%{version}.tar.xz Source0: https://github.com/flatpak/xdg-desktop-portal/releases/download/%{version}/%{name}-%{version}.tar.xz
Patch0: %{url}/commit/d7622e15ff8fef114a6759dde564826d04215a9f.patch#/open-uri-Avoid-calling-into-o.fd.FileManager1-during-startup.patch
BuildRequires: make BuildRequires: make
BuildRequires: gcc BuildRequires: gcc
BuildRequires: pkgconfig(flatpak) BuildRequires: pkgconfig(flatpak)
@ -102,6 +104,9 @@ install -dm 755 %{buildroot}/%{_datadir}/%{name}/portals
%changelog %changelog
* Tue Nov 09 2021 Aleksei Bavshin <alebastr@fedoraproject.org> - 1.10.1-2
- Add patch for org.freedesktop.FileManager1 deadlock (#2020371)
* Mon Sep 20 2021 David King <amigadave@amigadave.com> - 1.10.1-1 * Mon Sep 20 2021 David King <amigadave@amigadave.com> - 1.10.1-1
- Update to 1.10.1 (#2006126) - Update to 1.10.1 (#2006126)