From e3fe2027889a28294a0dee1751b402de94bd9847 Mon Sep 17 00:00:00 2001
From: Khalid Abu Shawarib <khalid.shawarib@gmail.com>
Date: Wed, 25 Dec 2024 22:44:08 +0300
Subject: [PATCH 1/2] gresource: Use one later stage for appdata

Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/3682
---
 src/resources/nautilus.gresource.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml
index 99ba940dc3..643f4b550a 100644
--- a/src/resources/nautilus.gresource.xml
+++ b/src/resources/nautilus.gresource.xml
@@ -2,7 +2,7 @@
 <gresources>
   <gresource prefix="/org/gnome/nautilus">
     <file compressed="true">ui/nautilus-preferences-dialog.ui</file>
-    <file alias="appdata" compressed="true" preprocess="xml-stripblanks">./../data/org.gnome.Nautilus.metainfo.xml.in.in</file>
+    <file alias="appdata" compressed="true" preprocess="xml-stripblanks">./../data/org.gnome.Nautilus.metainfo.xml.in</file>
     <file compressed="true">ui/nautilus-search-popover.ui</file>
     <file>ui/nautilus-search-types-dialog.ui</file>
     <file>ui/nautilus-app-chooser.ui</file>
-- 
GitLab


From 5ad36a5821476273bf5cf8d8b382de1f7d4ed59e Mon Sep 17 00:00:00 2001
From: Khalid Abu Shawarib <khalid.shawarib@gmail.com>
Date: Fri, 27 Dec 2024 18:32:22 +0300
Subject: [PATCH 2/2] files-view: Prevent theoretical null dereference

---
 src/nautilus-files-view.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index f00de03083..1261a04772 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -6125,6 +6125,11 @@ copy_or_move_selection (NautilusFilesView *view,
 
     selection = nautilus_files_view_get_selection_for_file_transfer (view);
 
+    if (selection == NULL)
+    {
+        return;
+    }
+
     gtk_file_dialog_set_title (dialog, title);
     gtk_file_dialog_set_accept_label (dialog, _("_Select"));
 
-- 
GitLab