From 8646403ebf1bd0216788412d9b1e91f9003f51ba Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 6 Feb 2020 15:22:20 +0100 Subject: [PATCH] Update patch No otherwise functional changes, so no rebuild necessary --- ...up-files-depending-on-the-opening-ap.patch | 27 ++++++++++++++++--- nautilus.spec | 3 ++- 2 files changed, 26 insertions(+), 4 deletions(-) rename 0001-Revert-mime-actions-launch-default-uri-handlers-when.patch => 0001-mime-actions-Group-files-depending-on-the-opening-ap.patch (95%) diff --git a/0001-Revert-mime-actions-launch-default-uri-handlers-when.patch b/0001-mime-actions-Group-files-depending-on-the-opening-ap.patch similarity index 95% rename from 0001-Revert-mime-actions-launch-default-uri-handlers-when.patch rename to 0001-mime-actions-Group-files-depending-on-the-opening-ap.patch index 3a9f241..ea3fc3e 100644 --- a/0001-Revert-mime-actions-launch-default-uri-handlers-when.patch +++ b/0001-mime-actions-Group-files-depending-on-the-opening-ap.patch @@ -1,10 +1,31 @@ -From 759cbb3a7b6d633b55f367a913c1f7b5abb380bd Mon Sep 17 00:00:00 2001 +From a1f80ac9b4fa2cf8f27e53badeed473b913b0aa0 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 6 Feb 2020 15:04:31 +0100 -Subject: [PATCH] Revert "mime-actions: launch default uri handlers when - activating files" +Subject: [PATCH] mime-actions: Group files depending on the opening app + +Reinstate the old behaviour which used to look at the files to open, +group them by handling application, and pass a single call to each +application with all the files it could handle. + +For the common case where it's a single application handling all the +files, as is usual for handling media files (images, videos, music, +etc.), it changes the launching behaviour from: +application.bin foo.mp3 +application.bin foo2.mp3 +application.bin foo3.mp3 +to: +application.bin foo.mp3 foo2.mp3 foo3.mp3 + +This however impacts the behaviour of nautilus launching applications +when inside a Flatpak sandbox, as it cannot enumerate and launch +applications itself. As the Flatpak sandbox is a development tool, and +for the sake of expediency, we reverted to the old code path. + +Revert "mime-actions: launch default uri handlers when activating files" This reverts commit f5206a6daf0991d91e885a28bb66795a8ae12a41. + +Closes: #117 --- src/nautilus-mime-actions.c | 268 +++++++++++++++++++++++--------- src/nautilus-program-choosing.c | 190 +++------------------- diff --git a/nautilus.spec b/nautilus.spec index f238965..1eb128d 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -46,7 +46,8 @@ Requires: tracker-miners Conflicts: totem-nautilus < 1:3.31.91 # https://gitlab.gnome.org/GNOME/nautilus/issues/117#note_496825 -Patch0: 0001-Revert-mime-actions-launch-default-uri-handlers-when.patch +# https://gitlab.gnome.org/GNOME/nautilus/merge_requests/518 +Patch0: 0001-mime-actions-Group-files-depending-on-the-opening-ap.patch %description Nautilus is the file manager and graphical shell for the GNOME desktop