Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

56 changed files with 615 additions and 6972 deletions

194
.gitignore vendored
View File

@ -1 +1,193 @@
SOURCES/nautilus-3.28.1.tar.xz
nautilus-2.31.5.tar.bz2
nautilus-2.31.6.tar.bz2
/nautilus-2.31.90.tar.bz2
/nautilus-2.90.1.tar.bz2
/nautilus-2.90.1-gitf3bbee7.tar.gz
/nautilus-2.91.0.tar.bz2
/nautilus-2.91.0.1.tar.bz2
/nautilus-2.91.1.tar.bz2
/nautilus-2.91.2.tar.bz2
/nautilus-2.91.3.tar.gz
/nautilus-2.91.3.tar.bz2
/nautilus-2.91.6.tar.bz2
/nautilus-2.91.7.tar.bz2
/nautilus-2.91.8.tar.bz2
/nautilus-2.91.9.tar.bz2
/nautilus-2.91.90.tar.bz2
/nautilus-2.91.90.1.tar.bz2
/nautilus-2.91.91.tar.bz2
/nautilus-2.91.92.tar.bz2
/nautilus-2.91.93.tar.bz2
/nautilus-2.91.94.tar.bz2
/nautilus-3.0.0.tar.bz2
/nautilus-3.0.1.tar.bz2
/nautilus-3.1.1.tar.bz2
/nautilus-3.1.2.tar.bz2
/nautilus-3.1.3.tar.xz
/nautilus-3.1.4.tar.xz
/nautilus-3.1.90.tar.xz
/nautilus-3.1.92.tar.xz
/nautilus-3.2.0.tar.xz
/nautilus-3.2.1.tar.xz
/nautilus-3.3.1.1.tar.xz
/nautilus-3.3.3.tar.xz
/nautilus-3.3.4.tar.xz
/nautilus-3.3.5.tar.xz
/nautilus-3.3.90.tar.xz
/nautilus-3.3.91.tar.xz
/nautilus-3.3.92.tar.xz
/nautilus-3.4.0.tar.xz
/nautilus-3.4.1.tar.xz
/nautilus-3.5.1.tar.xz
/nautilus-3.5.2.tar.xz
/nautilus-3.5.3.tar.xz
/nautilus-3.5.4.tar.xz
/nautilus-3.5.5.tar.xz
/nautilus-3.5.90.tar.xz
/nautilus-3.5.91.tar.xz
/nautilus-3.5.92.tar.xz
/nautilus-3.6.0.tar.xz
/nautilus-3.6.1.tar.xz
/nautilus-3.7.1.tar.xz
/nautilus-3.7.2.tar.xz
/nautilus-3.7.3.tar.xz
/nautilus-3.7.4.tar.xz
/nautilus-3.7.5.tar.xz
/nautilus-3.7.90.tar.xz
/nautilus-3.7.91.tar.xz
/nautilus-3.7.92.tar.xz
/nautilus-3.8.0.tar.xz
/nautilus-3.8.1.tar.xz
/nautilus-3.8.2.tar.xz
/nautilus-3.9.3.tar.xz
/nautilus-3.9.90.tar.xz
/nautilus-3.9.91.tar.xz
/nautilus-3.9.92.tar.xz
/nautilus-3.10.0.tar.xz
/nautilus-3.10.1.tar.xz
/nautilus-3.11.2.tar.xz
/nautilus-3.11.3.tar.xz
/nautilus-3.11.90.tar.xz
/nautilus-3.11.92.tar.xz
/nautilus-3.12.0.tar.xz
/nautilus-3.13.1.tar.xz
/nautilus-3.13.2.tar.xz
/nautilus-3.13.90.tar.xz
/nautilus-3.13.91.tar.xz
/nautilus-3.13.92.tar.xz
/nautilus-3.14.0.tar.xz
/nautilus-3.14.1.tar.xz
/nautilus-3.14.2.tar.xz
/nautilus-3.15.4.tar.xz
/nautilus-3.15.90.tar.xz
/nautilus-3.15.91.tar.xz
/nautilus-3.15.92.tar.xz
/nautilus-3.16.0.tar.xz
/nautilus-3.16.1.tar.xz
/nautilus-3.16.2.tar.xz
/nautilus-3.17.2.tar.xz
/nautilus-3.17.3.tar.xz
/nautilus-3.17.90.tar.xz
/nautilus-3.17.91.tar.xz
/nautilus-3.18.0.tar.xz
/nautilus-3.18.1.tar.xz
/nautilus-3.18.2.tar.xz
/nautilus-3.19.2.tar.xz
/nautilus-3.19.90.tar.xz
/nautilus-3.19.91.tar.xz
/nautilus-3.19.93.tar.xz
/nautilus-3.20.0.tar.xz
/nautilus-3.20.1.tar.xz
/nautilus-3.20.2.tar.xz
/nautilus-3.20.3.tar.xz
/nautilus-3.21.91.1.tar.xz
/nautilus-3.21.92.tar.xz
/nautilus-3.22.0.tar.xz
/nautilus-3.22.1.tar.xz
/nautilus-3.22.2.tar.xz
/nautilus-3.23.90.tar.xz
/nautilus-3.23.91.tar.xz
/nautilus-3.23.92.tar.xz
/nautilus-3.24.0.tar.xz
/nautilus-3.24.1.tar.xz
/nautilus-3.24.2.1.tar.xz
/nautilus-3.25.1.tar.xz
/nautilus-3.25.90.tar.xz
/nautilus-3.25.92.tar.xz
/nautilus-3.26.0.tar.xz
/nautilus-3.26.2.tar.xz
/nautilus-3.27.92.1.tar.xz
/nautilus-3.28.0.tar.xz
/nautilus-3.28.0.1.tar.xz
/nautilus-3.28.1.tar.xz
/nautilus-3.29.90.1.tar.xz
/nautilus-3.30.0.tar.xz
/nautilus-3.30.1.tar.xz
/nautilus-3.30.2.tar.xz
/nautilus-3.30.3.tar.xz
/nautilus-3.30.4.tar.xz
/nautilus-3.30.5.tar.xz
/nautilus-3.31.90.tar.xz
/nautilus-3.32.0.tar.xz
/nautilus-3.32.1.tar.xz
/nautilus-3.33.90.tar.xz
/nautilus-3.34.0.tar.xz
/nautilus-3.34.1.tar.xz
/nautilus-3.34.2.tar.xz
/nautilus-3.35.2.tar.xz
/nautilus-3.35.90.tar.xz
/nautilus-3.35.91.1.tar.xz
/nautilus-3.35.92.tar.xz
/nautilus-3.36.0.tar.xz
/nautilus-3.37.1.tar.xz
/nautilus-3.37.90.tar.xz
/nautilus-3.37.91.tar.xz
/nautilus-3.37.92.tar.xz
/nautilus-3.38.0.tar.xz
/nautilus-3.38.1.tar.xz
/nautilus-3.38.2.tar.xz
/nautilus-40.beta.tar.xz
/nautilus-40.rc.tar.xz
/nautilus-40.0.tar.xz
/nautilus-40.1.tar.xz
/nautilus-41.alpha.tar.xz
/nautilus-41.beta.tar.xz
/nautilus-41.rc.tar.xz
/nautilus-41.0.tar.xz
/nautilus-41.1.tar.xz
/nautilus-42.alpha.tar.xz
/nautilus-42.beta.tar.xz
/nautilus-42.rc.tar.xz
/nautilus-42.0.tar.xz
/nautilus-42.1.tar.xz
/nautilus-42.1.1.tar.xz
/nautilus-42.2.tar.xz
/nautilus-43.alpha.tar.xz
/nautilus-43.beta.1.tar.xz
/nautilus-43.rc.tar.xz
/nautilus-43.0.tar.xz
/nautilus-43.1.tar.xz
/nautilus-43.2.tar.xz
/nautilus-44.alpha.tar.xz
/nautilus-44.beta.tar.xz
/nautilus-44.rc.tar.xz
/nautilus-44.0.tar.xz
/nautilus-44.1.tar.xz
/nautilus-44.2.tar.xz
/nautilus-44.2.1.tar.xz
/nautilus-45.alpha.tar.xz
/nautilus-45.beta.tar.xz
/nautilus-45.beta2.tar.xz
/nautilus-45.rc.tar.xz
/nautilus-45.0.tar.xz
/nautilus-45.1.tar.xz
/nautilus-45.2.1.tar.xz
/nautilus-46.alpha.0.tar.xz
/nautilus-46.alpha.1.tar.xz
/nautilus-46.beta.tar.xz
/nautilus-46.rc.tar.xz
/nautilus-46.0.tar.xz
/nautilus-46.1.tar.xz
/nautilus-46.2.tar.xz
/nautilus-47.0.tar.xz
/nautilus-47.1.tar.xz

View File

@ -1,69 +0,0 @@
From db2b7aea67c994ba8a6e5a9ffec245b1daebcdfb Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Mon, 6 Aug 2018 17:32:00 +0200
Subject: [PATCH 01/11] dbus-manager: Implement trashing files
So desktop icons extension can use it.
---
data/dbus-interfaces.xml | 3 +++
src/nautilus-dbus-manager.c | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 35fb9945b..4588762a9 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -35,5 +35,8 @@
<arg type='s' name='DestinationDirectoryURI' direction='in'/>
<arg type='s' name='DestinationDisplayName' direction='in'/>
</method>
+ <method name='TrashFiles'>
+ <arg type='as' name='URIs' direction='in'/>
+ </method>
</interface>
</node>
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 3611a2358..4da1c727b 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -131,6 +131,26 @@ handle_empty_trash (NautilusDBusFileOperations *object,
return TRUE; /* invocation was handled */
}
+static gboolean
+handle_trash_files (NautilusDBusFileOperations *object,
+ GDBusMethodInvocation *invocation,
+ const gchar **sources)
+{
+ g_autolist (GFile) source_files = NULL;
+ gint idx;
+
+ for (idx = 0; sources[idx] != NULL; idx++)
+ {
+ source_files = g_list_prepend (source_files,
+ g_file_new_for_uri (sources[idx]));
+ }
+
+ nautilus_file_operations_trash_or_delete (source_files, NULL, NULL, NULL);
+
+ nautilus_dbus_file_operations_complete_trash_files (object, invocation);
+ return TRUE; /* invocation was handled */
+}
+
static void
nautilus_dbus_manager_init (NautilusDBusManager *self)
{
@@ -148,6 +168,10 @@ nautilus_dbus_manager_init (NautilusDBusManager *self)
"handle-empty-trash",
G_CALLBACK (handle_empty_trash),
self);
+ g_signal_connect (self->file_operations,
+ "handle-trash-files",
+ G_CALLBACK (handle_trash_files),
+ self);
}
static void
--
2.17.1

View File

@ -1,71 +0,0 @@
From d2be99e4528759d28985246a55c9d4513e78f918 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Mon, 6 Aug 2018 20:11:31 +0200
Subject: [PATCH 02/11] dbus-manager: Implement creation of new folders
For the integration with the desktop icons extension.
---
data/dbus-interfaces.xml | 3 +++
src/nautilus-dbus-manager.c | 26 ++++++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 4588762a9..4e67f1393 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -38,5 +38,8 @@
<method name='TrashFiles'>
<arg type='as' name='URIs' direction='in'/>
</method>
+ <method name='CreateFolder'>
+ <arg type='s' name='URI' direction='in'/>
+ </method>
</interface>
</node>
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 4da1c727b..337a73262 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -94,6 +94,28 @@ handle_copy_file (NautilusDBusFileOperations *object,
return TRUE; /* invocation was handled */
}
+static gboolean
+handle_create_folder (NautilusDBusFileOperations *object,
+ GDBusMethodInvocation *invocation,
+ const gchar *uri)
+{
+ g_autoptr (GFile) file = NULL;
+ g_autoptr (GFile) parent_file = NULL;
+ g_autofree gchar *basename = NULL;
+ g_autofree gchar *parent_file_uri = NULL;
+
+ file = g_file_new_for_uri (uri);
+ basename = g_file_get_basename (file);
+ parent_file = g_file_get_parent (file);
+ parent_file_uri = g_file_get_uri (parent_file);
+
+ nautilus_file_operations_new_folder (NULL, parent_file_uri, basename,
+ NULL, NULL);
+
+ nautilus_dbus_file_operations_complete_create_folder (object, invocation);
+ return TRUE; /* invocation was handled */
+}
+
static gboolean
handle_copy_uris (NautilusDBusFileOperations *object,
GDBusMethodInvocation *invocation,
@@ -172,6 +194,10 @@ nautilus_dbus_manager_init (NautilusDBusManager *self)
"handle-trash-files",
G_CALLBACK (handle_trash_files),
self);
+ g_signal_connect (self->file_operations,
+ "handle-create-folder",
+ G_CALLBACK (handle_create_folder),
+ self);
}
static void
--
2.17.1

View File

@ -1,88 +0,0 @@
From 42ea37f93c134d55cd622e3e346726babaf56139 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Mon, 6 Aug 2018 20:12:00 +0200
Subject: [PATCH 03/11] dbus-manager: Implement undo/redo
For the integration with the desktop icons extension.
---
data/dbus-interfaces.xml | 4 ++++
src/nautilus-dbus-manager.c | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 4e67f1393..2133bb99c 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -41,5 +41,9 @@
<method name='CreateFolder'>
<arg type='s' name='URI' direction='in'/>
</method>
+ <method name='Undo'>
+ </method>
+ <method name='Redo'>
+ </method>
</interface>
</node>
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 337a73262..bce6b5c4d 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -26,6 +26,7 @@
#include "nautilus-generated.h"
#include "nautilus-file-operations.h"
+#include "nautilus-file-undo-manager.h"
#define DEBUG_FLAG NAUTILUS_DEBUG_DBUS
#include "nautilus-debug.h"
@@ -94,6 +95,32 @@ handle_copy_file (NautilusDBusFileOperations *object,
return TRUE; /* invocation was handled */
}
+static gboolean
+handle_redo (NautilusDBusFileOperations *object,
+ GDBusMethodInvocation *invocation)
+{
+ g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
+
+ undo_manager = nautilus_file_undo_manager_get ();
+ nautilus_file_undo_manager_redo (NULL);
+
+ nautilus_dbus_file_operations_complete_redo (object, invocation);
+ return TRUE; /* invocation was handled */
+}
+
+static gboolean
+handle_undo (NautilusDBusFileOperations *object,
+ GDBusMethodInvocation *invocation)
+{
+ g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
+
+ undo_manager = nautilus_file_undo_manager_get ();
+ nautilus_file_undo_manager_undo (NULL);
+
+ nautilus_dbus_file_operations_complete_undo (object, invocation);
+ return TRUE; /* invocation was handled */
+}
+
static gboolean
handle_create_folder (NautilusDBusFileOperations *object,
GDBusMethodInvocation *invocation,
@@ -198,6 +225,14 @@ nautilus_dbus_manager_init (NautilusDBusManager *self)
"handle-create-folder",
G_CALLBACK (handle_create_folder),
self);
+ g_signal_connect (self->file_operations,
+ "handle-undo",
+ G_CALLBACK (handle_undo),
+ self);
+ g_signal_connect (self->file_operations,
+ "handle-redo",
+ G_CALLBACK (handle_redo),
+ self);
}
static void
--
2.17.1

View File

@ -1,46 +0,0 @@
From ef022816e3fe321d9ee9b5a2deab96ca718f7215 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Tue, 7 Aug 2018 10:47:28 +0200
Subject: [PATCH 04/11] dbus-manager: Use a more robust copy operation
We were using the copy_file operation which seems to be quite buggy,
Nautilus should probably drop that one soon, specially since no other
part of Nautilus uses it.
---
src/nautilus-dbus-manager.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index bce6b5c4d..8135c9650 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -150,22 +150,17 @@ handle_copy_uris (NautilusDBusFileOperations *object,
const gchar *destination)
{
GList *source_files = NULL;
- GFile *dest_dir;
gint idx;
- dest_dir = g_file_new_for_uri (destination);
-
for (idx = 0; sources[idx] != NULL; idx++)
{
- source_files = g_list_prepend (source_files,
- g_file_new_for_uri (sources[idx]));
+ source_files = g_list_prepend (source_files, g_strdup (sources[idx]));
}
- nautilus_file_operations_copy (source_files, dest_dir, NULL, NULL, NULL);
-
- g_list_free_full (source_files, g_object_unref);
- g_object_unref (dest_dir);
+ nautilus_file_operations_copy_move (source_files, destination,
+ GDK_ACTION_COPY, NULL, NULL, NULL);
+ g_list_free_full (source_files, g_free);
nautilus_dbus_file_operations_complete_copy_uris (object, invocation);
return TRUE; /* invocation was handled */
}
--
2.17.1

View File

@ -1,88 +0,0 @@
From 32f347bd83495edf2bda746d17e613c868a7c379 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Tue, 7 Aug 2018 11:51:54 +0200
Subject: [PATCH 05/11] file-operations: Don't crash if source file not present
on creation
When creating a file it was checking if the file already exists, and if
so it tried to give a new name based on the original file that was being
duplicated from which is the case for the regular copy/paste and the
template creation.
However, creating a file is not only about duplicating from another one,
it also can come from creating a folder, that although in the UI it
prevents doing so, it can still be done through the dbus operation.
Fix that by checking whether there is an actual source file, and if not,
use the name provided as base name.
---
src/nautilus-file-operations.c | 36 ++++++++++++++++------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index 4d84b98be..cf5e7f46b 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -7324,20 +7324,18 @@ retry:
{
g_autofree char *filename2 = NULL;
g_autofree char *suffix = NULL;
- NautilusFile *file;
- file = nautilus_file_get (job->src);
- if (nautilus_file_is_directory (file))
- {
- filename_base = filename;
- }
- else
+ filename_base = filename;
+ if (job->src != NULL)
{
- filename_base = eel_filename_strip_extension (filename);
+ g_autoptr (NautilusFile) file = NULL;
+ file = nautilus_file_get (job->src);
+ if (!nautilus_file_is_directory (file))
+ {
+ filename_base = eel_filename_strip_extension (filename);
+ }
}
- nautilus_file_unref (file);
-
offset = strlen (filename_base);
suffix = g_strdup (filename + offset);
@@ -7377,21 +7375,21 @@ retry:
{
g_autofree char *suffix = NULL;
g_autofree gchar *filename2 = NULL;
- NautilusFile *file;
g_clear_object (&dest);
- file = nautilus_file_get (job->src);
- if (nautilus_file_is_directory (file))
- {
- filename_base = filename;
- }
- else
+ filename_base = filename;
+ if (job->src != NULL)
{
- filename_base = eel_filename_strip_extension (filename);
+ g_autoptr (NautilusFile) file = NULL;
+
+ file = nautilus_file_get (job->src);
+ if (!nautilus_file_is_directory (file))
+ {
+ filename_base = eel_filename_strip_extension (filename);
+ }
}
- nautilus_file_unref (file);
offset = strlen (filename_base);
suffix = g_strdup (filename + offset);
--
2.17.1

View File

@ -1,359 +0,0 @@
From 965a1fb9dcd468b9fc0b87279f3a4a33b6bd635c Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Tue, 7 Aug 2018 12:40:42 +0200
Subject: [PATCH 06/11] properties-window: Keep alive properties window if
called through DBus
The properties window can be used from within Nautilus, and therefore a
dialog window makes sense, or from outside Nautilus, such as the
FileManager dbus free desktop standard.
In the later, used for integration with things like desktop icons
extensions, we need to keep the application alive since GApplication
would close the application if no application window is alive after a
timeout.
To fix this, this work makes the window hint a regular window if used
from those cases.
---
src/nautilus-files-view.c | 6 +-
src/nautilus-freedesktop-dbus.c | 10 ++-
src/nautilus-pathbar.c | 3 +-
src/nautilus-properties-window.c | 106 ++++++++++++++++++++++---------
src/nautilus-properties-window.h | 10 ++-
src/nautilus-window.c | 3 +-
6 files changed, 101 insertions(+), 37 deletions(-)
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 8aff33e25..5395390e7 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -2435,14 +2435,16 @@ action_properties (GSimpleAction *action,
{
files = g_list_append (NULL, nautilus_file_ref (priv->directory_as_file));
- nautilus_properties_window_present (files, GTK_WIDGET (view), NULL);
+ nautilus_properties_window_present (files, GTK_WIDGET (view), NULL,
+ NULL, NULL);
nautilus_file_list_free (files);
}
}
else
{
- nautilus_properties_window_present (selection, GTK_WIDGET (view), NULL);
+ nautilus_properties_window_present (selection, GTK_WIDGET (view), NULL,
+ NULL, NULL);
}
}
diff --git a/src/nautilus-freedesktop-dbus.c b/src/nautilus-freedesktop-dbus.c
index c4657aba3..b88809908 100644
--- a/src/nautilus-freedesktop-dbus.c
+++ b/src/nautilus-freedesktop-dbus.c
@@ -114,6 +114,12 @@ skeleton_handle_show_folders_cb (NautilusFreedesktopFileManager1 *object,
return TRUE;
}
+static void
+properties_window_on_finished (gpointer user_data)
+{
+ g_application_release (g_application_get_default ());
+}
+
static gboolean
skeleton_handle_show_item_properties_cb (NautilusFreedesktopFileManager1 *object,
GDBusMethodInvocation *invocation,
@@ -133,7 +139,9 @@ skeleton_handle_show_item_properties_cb (NautilusFreedesktopFileManager1 *object
files = g_list_reverse (files);
- nautilus_properties_window_present (files, NULL, startup_id);
+ g_application_hold (g_application_get_default ());
+ nautilus_properties_window_present (files, NULL, startup_id,
+ properties_window_on_finished, NULL);
nautilus_file_list_free (files);
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 630b8ed33..ea3d2b53f 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -211,7 +211,8 @@ action_pathbar_properties (GSimpleAction *action,
files = g_list_append (NULL, nautilus_file_ref (priv->context_menu_file));
- nautilus_properties_window_present (files, GTK_WIDGET (self), NULL);
+ nautilus_properties_window_present (files, GTK_WIDGET (self), NULL, NULL,
+ NULL);
nautilus_file_list_free (files);
}
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 8bd335a07..5405435cd 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -152,6 +152,9 @@ typedef struct
char *startup_id;
char *pending_key;
GHashTable *pending_files;
+ NautilusPropertiesWindowCallback callback;
+ gpointer callback_data;
+ NautilusPropertiesWindow *window;
} StartupData;
/* drag and drop definitions */
@@ -197,8 +200,6 @@ static void is_directory_ready_callback (NautilusFile *file,
gpointer data);
static void cancel_group_change_callback (GroupChange *change);
static void cancel_owner_change_callback (OwnerChange *change);
-static void parent_widget_destroyed_callback (GtkWidget *widget,
- gpointer callback_data);
static void select_image_button_callback (GtkWidget *widget,
NautilusPropertiesWindow *properties_window);
static void set_icon (const char *icon_path,
@@ -4811,12 +4812,15 @@ get_pending_key (GList *file_list)
}
static StartupData *
-startup_data_new (GList *original_files,
- GList *target_files,
- const char *pending_key,
- GtkWidget *parent_widget,
- GtkWindow *parent_window,
- const char *startup_id)
+startup_data_new (GList *original_files,
+ GList *target_files,
+ const char *pending_key,
+ GtkWidget *parent_widget,
+ GtkWindow *parent_window,
+ const char *startup_id,
+ NautilusPropertiesWindowCallback callback,
+ gpointer callback_data,
+ NautilusPropertiesWindow *window)
{
StartupData *data;
GList *l;
@@ -4830,6 +4834,9 @@ startup_data_new (GList *original_files,
data->pending_key = g_strdup (pending_key);
data->pending_files = g_hash_table_new (g_direct_hash,
g_direct_equal);
+ data->callback = callback;
+ data->callback_data = callback_data;
+ data->window = window;
for (l = data->target_files; l != NULL; l = l->next)
{
@@ -5149,7 +5156,7 @@ remove_window (NautilusPropertiesWindow *window)
}
}
-static GtkWindow *
+static NautilusPropertiesWindow *
get_existing_window (GList *file_list)
{
if (!file_list->next)
@@ -5160,10 +5167,28 @@ get_existing_window (GList *file_list)
return NULL;
}
+static void
+properties_window_finish (StartupData *data)
+{
+ if (data->parent_widget != NULL)
+ {
+ g_signal_handlers_disconnect_by_data (data->parent_widget,
+ data);
+ }
+ if (data->window != NULL)
+ {
+ g_signal_handlers_disconnect_by_data (data->window,
+ data);
+ }
+
+ remove_pending (data, TRUE, TRUE, FALSE);
+ startup_data_free (data);
+}
+
static void
cancel_create_properties_window_callback (gpointer callback_data)
{
- remove_pending ((StartupData *) callback_data, TRUE, FALSE, TRUE);
+ properties_window_finish ((StartupData *) callback_data);
}
static void
@@ -5172,7 +5197,7 @@ parent_widget_destroyed_callback (GtkWidget *widget,
{
g_assert (widget == ((StartupData *) callback_data)->parent_widget);
- remove_pending ((StartupData *) callback_data, TRUE, TRUE, FALSE);
+ properties_window_finish ((StartupData *) callback_data);
}
static void
@@ -5203,16 +5228,24 @@ remove_pending (StartupData *startup_data,
eel_timed_wait_stop
(cancel_create_properties_window_callback, startup_data);
}
- if (cancel_destroy_handler && startup_data->parent_widget)
+ g_hash_table_remove (pending_lists, startup_data->pending_key);
+}
+
+static gboolean
+widget_on_destroy (GtkWidget *widget,
+ gpointer user_data)
+{
+ StartupData *data = (StartupData *) user_data;
+
+
+ if (data->callback != NULL)
{
- g_signal_handlers_disconnect_by_func (startup_data->parent_widget,
- G_CALLBACK (parent_widget_destroyed_callback),
- startup_data);
+ data->callback (data->callback_data);
}
- g_hash_table_remove (pending_lists, startup_data->pending_key);
+ properties_window_finish (data);
- startup_data_free (startup_data);
+ return GDK_EVENT_PROPAGATE;
}
static void
@@ -5232,29 +5265,34 @@ is_directory_ready_callback (NautilusFile *file,
new_window = create_properties_window (startup_data);
add_window (new_window);
+ startup_data->window = new_window;
remove_pending (startup_data, FALSE, TRUE, TRUE);
gtk_window_present (GTK_WINDOW (new_window));
+ g_signal_connect(GTK_WIDGET (new_window), "destroy",
+ G_CALLBACK (widget_on_destroy), startup_data);
}
}
-
void
-nautilus_properties_window_present (GList *original_files,
- GtkWidget *parent_widget,
- const gchar *startup_id)
+nautilus_properties_window_present (GList *original_files,
+ GtkWidget *parent_widget,
+ const gchar *startup_id,
+ NautilusPropertiesWindowCallback callback,
+ gpointer callback_data)
{
GList *l, *next;
- GtkWidget *parent_window;
+ GtkWindow *parent_window;
StartupData *startup_data;
GList *target_files;
- GtkWindow *existing_window;
+ NautilusPropertiesWindow *existing_window;
char *pending_key;
g_return_if_fail (original_files != NULL);
g_return_if_fail (parent_widget == NULL || GTK_IS_WIDGET (parent_widget));
+
/* Create the hash tables first time through. */
if (windows == NULL)
{
@@ -5272,15 +5310,19 @@ nautilus_properties_window_present (GList *original_files,
{
if (parent_widget)
{
- gtk_window_set_screen (existing_window,
+ gtk_window_set_screen (GTK_WINDOW (existing_window),
gtk_widget_get_screen (parent_widget));
}
else if (startup_id)
{
- gtk_window_set_startup_id (existing_window, startup_id);
+ gtk_window_set_startup_id (GTK_WINDOW (existing_window), startup_id);
}
- gtk_window_present (existing_window);
+ gtk_window_present (GTK_WINDOW (existing_window));
+ startup_data = startup_data_new (NULL, NULL, NULL, NULL, NULL, NULL,
+ callback, callback_data, existing_window);
+ g_signal_connect(GTK_WIDGET (existing_window), "destroy",
+ G_CALLBACK (widget_on_destroy), startup_data);
return;
}
@@ -5290,6 +5332,9 @@ nautilus_properties_window_present (GList *original_files,
/* Look to see if we're already waiting for a window for this file. */
if (g_hash_table_lookup (pending_lists, pending_key) != NULL)
{
+ /* FIXME: No callback is done if this happen. In practice, it's a quite
+ * corner case
+ */
return;
}
@@ -5297,7 +5342,7 @@ nautilus_properties_window_present (GList *original_files,
if (parent_widget)
{
- parent_window = gtk_widget_get_ancestor (parent_widget, GTK_TYPE_WINDOW);
+ parent_window = GTK_WINDOW (gtk_widget_get_ancestor (parent_widget, GTK_TYPE_WINDOW));
}
else
{
@@ -5308,8 +5353,11 @@ nautilus_properties_window_present (GList *original_files,
target_files,
pending_key,
parent_widget,
- GTK_WINDOW (parent_window),
- startup_id);
+ parent_window,
+ startup_id,
+ callback,
+ callback_data,
+ NULL);
nautilus_file_list_free (target_files);
g_free (pending_key);
diff --git a/src/nautilus-properties-window.h b/src/nautilus-properties-window.h
index 9eff54c4e..e8d6a90e9 100644
--- a/src/nautilus-properties-window.h
+++ b/src/nautilus-properties-window.h
@@ -59,8 +59,12 @@ typedef struct NautilusPropertiesWindowClass NautilusPropertiesWindowClass;
GType nautilus_properties_window_get_type (void);
-void nautilus_properties_window_present (GList *files,
- GtkWidget *parent_widget,
- const gchar *startup_id);
+typedef void (* NautilusPropertiesWindowCallback) (gpointer callback_data);
+
+void nautilus_properties_window_present (GList *files,
+ GtkWidget *parent_widget,
+ const gchar *startup_id,
+ NautilusPropertiesWindowCallback callback,
+ gpointer callback_data);
#endif /* NAUTILUS_PROPERTIES_WINDOW_H */
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 41c4623be..a6ee4d489 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1309,7 +1309,8 @@ action_properties (GSimpleAction *action,
file = nautilus_file_get (priv->selected_file);
list = g_list_append (NULL, file);
- nautilus_properties_window_present (list, GTK_WIDGET (window), NULL);
+ nautilus_properties_window_present (list, GTK_WIDGET (window), NULL, NULL,
+ NULL);
nautilus_file_list_free (list);
g_clear_object (&priv->selected_file);
--
2.17.1

View File

@ -1,149 +0,0 @@
From 80b807d9e52fdc3e5e0af5a2d4dd61fdb0a39bc8 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Tue, 7 Aug 2018 21:08:21 +0200
Subject: [PATCH 07/11] dbus-manager: Keep application alive for operations
Operations started from Nautilus windows have the persistence handler,
however, when not using windows like when invoked through DBus the
application could die after a timeout.
This would stop the operation in the middle of its process, with
possible data loss.
Make sure we keep the application alive while this is happening.
---
src/nautilus-dbus-manager.c | 55 +++++++++++++++++++++++++++++++++++--
1 file changed, 52 insertions(+), 3 deletions(-)
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 8135c9650..0d5137292 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -95,13 +95,29 @@ handle_copy_file (NautilusDBusFileOperations *object,
return TRUE; /* invocation was handled */
}
+static void
+undo_redo_on_finished (gpointer user_data)
+{
+ g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
+ int *handler_id = (int *) user_data;
+
+ undo_manager = nautilus_file_undo_manager_get ();
+ g_signal_handler_disconnect (undo_manager, *handler_id);
+ g_application_release (g_application_get_default ());
+ g_free (handler_id);
+}
+
static gboolean
handle_redo (NautilusDBusFileOperations *object,
GDBusMethodInvocation *invocation)
{
g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
+ gint *handler_id = g_new0(int, 1);
undo_manager = nautilus_file_undo_manager_get ();
+ *handler_id = g_signal_connect_swapped (undo_manager, "undo-changed",
+ G_CALLBACK (undo_redo_on_finished),
+ handler_id);
nautilus_file_undo_manager_redo (NULL);
nautilus_dbus_file_operations_complete_redo (object, invocation);
@@ -113,14 +129,26 @@ handle_undo (NautilusDBusFileOperations *object,
GDBusMethodInvocation *invocation)
{
g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
+ gint *handler_id = g_new0(int, 1);
undo_manager = nautilus_file_undo_manager_get ();
+ *handler_id = g_signal_connect_swapped (undo_manager, "undo-changed",
+ G_CALLBACK (undo_redo_on_finished),
+ handler_id);
nautilus_file_undo_manager_undo (NULL);
nautilus_dbus_file_operations_complete_undo (object, invocation);
return TRUE; /* invocation was handled */
}
+static void
+create_folder_on_finished (GFile *new_file,
+ gboolean success,
+ gpointer callback_data)
+{
+ g_application_release (g_application_get_default ());
+}
+
static gboolean
handle_create_folder (NautilusDBusFileOperations *object,
GDBusMethodInvocation *invocation,
@@ -136,13 +164,22 @@ handle_create_folder (NautilusDBusFileOperations *object,
parent_file = g_file_get_parent (file);
parent_file_uri = g_file_get_uri (parent_file);
+ g_application_hold (g_application_get_default ());
nautilus_file_operations_new_folder (NULL, parent_file_uri, basename,
- NULL, NULL);
+ create_folder_on_finished, NULL);
nautilus_dbus_file_operations_complete_create_folder (object, invocation);
return TRUE; /* invocation was handled */
}
+static void
+copy_on_finished (GHashTable *debutting_uris,
+ gboolean success,
+ gpointer callback_data)
+{
+ g_application_release (g_application_get_default ());
+}
+
static gboolean
handle_copy_uris (NautilusDBusFileOperations *object,
GDBusMethodInvocation *invocation,
@@ -157,14 +194,16 @@ handle_copy_uris (NautilusDBusFileOperations *object,
source_files = g_list_prepend (source_files, g_strdup (sources[idx]));
}
+ g_application_hold (g_application_get_default ());
nautilus_file_operations_copy_move (source_files, destination,
- GDK_ACTION_COPY, NULL, NULL, NULL);
+ GDK_ACTION_COPY, NULL, copy_on_finished, NULL);
g_list_free_full (source_files, g_free);
nautilus_dbus_file_operations_complete_copy_uris (object, invocation);
return TRUE; /* invocation was handled */
}
+/* FIXME: Needs a callback for maintaining alive the application */
static gboolean
handle_empty_trash (NautilusDBusFileOperations *object,
GDBusMethodInvocation *invocation)
@@ -175,6 +214,14 @@ handle_empty_trash (NautilusDBusFileOperations *object,
return TRUE; /* invocation was handled */
}
+static void
+trash_on_finished (GHashTable *debutting_uris,
+ gboolean user_cancel,
+ gpointer callback_data)
+{
+ g_application_release (g_application_get_default ());
+}
+
static gboolean
handle_trash_files (NautilusDBusFileOperations *object,
GDBusMethodInvocation *invocation,
@@ -189,7 +236,9 @@ handle_trash_files (NautilusDBusFileOperations *object,
g_file_new_for_uri (sources[idx]));
}
- nautilus_file_operations_trash_or_delete (source_files, NULL, NULL, NULL);
+ g_application_hold (g_application_get_default ());
+ nautilus_file_operations_trash_or_delete (source_files, NULL,
+ trash_on_finished, NULL);
nautilus_dbus_file_operations_complete_trash_files (object, invocation);
return TRUE; /* invocation was handled */
--
2.17.1

View File

@ -1,209 +0,0 @@
From 474ed07f64df1381440b8692d7d500d26014c618 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Tue, 7 Aug 2018 21:25:01 +0200
Subject: [PATCH 08/11] dbus-manager: Drop copy file operation
It was truly unreliable and not working clearly. We have a more powerful
and simpler API with CopyURIs, so there is no point to have this one.
This commits drops the DBus API. Note that the DBus version is not
bumped, I believe this DBus API is not used by any external service
given how broken was it.
---
data/dbus-interfaces.xml | 6 ---
src/nautilus-dbus-manager.c | 69 ++++++++++++++--------------------
src/nautilus-file-operations.c | 41 --------------------
src/nautilus-file-operations.h | 7 ----
4 files changed, 29 insertions(+), 94 deletions(-)
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 2133bb99c..20ffadde1 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -29,12 +29,6 @@
</method>
<method name='EmptyTrash'>
</method>"
- <method name='CopyFile'>
- <arg type='s' name='SourceFileURI' direction='in'/>
- <arg type='s' name='SourceDisplayName' direction='in'/>
- <arg type='s' name='DestinationDirectoryURI' direction='in'/>
- <arg type='s' name='DestinationDisplayName' direction='in'/>
- </method>
<method name='TrashFiles'>
<arg type='as' name='URIs' direction='in'/>
</method>
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 0d5137292..1ac6e12c2 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -61,40 +61,6 @@ nautilus_dbus_manager_dispose (GObject *object)
G_OBJECT_CLASS (nautilus_dbus_manager_parent_class)->dispose (object);
}
-static gboolean
-handle_copy_file (NautilusDBusFileOperations *object,
- GDBusMethodInvocation *invocation,
- const gchar *source_uri,
- const gchar *source_display_name,
- const gchar *dest_dir_uri,
- const gchar *dest_name)
-{
- GFile *source_file, *target_dir;
- const gchar *target_name = NULL, *source_name = NULL;
-
- source_file = g_file_new_for_uri (source_uri);
- target_dir = g_file_new_for_uri (dest_dir_uri);
-
- if (dest_name != NULL && dest_name[0] != '\0')
- {
- target_name = dest_name;
- }
-
- if (source_display_name != NULL && source_display_name[0] != '\0')
- {
- source_name = source_display_name;
- }
-
- nautilus_file_operations_copy_file (source_file, target_dir, source_name, target_name,
- NULL, NULL, NULL);
-
- g_object_unref (source_file);
- g_object_unref (target_dir);
-
- nautilus_dbus_file_operations_complete_copy_file (object, invocation);
- return TRUE; /* invocation was handled */
-}
-
static void
undo_redo_on_finished (gpointer user_data)
{
@@ -173,9 +139,9 @@ handle_create_folder (NautilusDBusFileOperations *object,
}
static void
-copy_on_finished (GHashTable *debutting_uris,
- gboolean success,
- gpointer callback_data)
+copy_move_on_finished (GHashTable *debutting_uris,
+ gboolean success,
+ gpointer callback_data)
{
g_application_release (g_application_get_default ());
}
@@ -196,7 +162,30 @@ handle_copy_uris (NautilusDBusFileOperations *object,
g_application_hold (g_application_get_default ());
nautilus_file_operations_copy_move (source_files, destination,
- GDK_ACTION_COPY, NULL, copy_on_finished, NULL);
+ GDK_ACTION_COPY, NULL, copy_move_on_finished, NULL);
+
+ g_list_free_full (source_files, g_free);
+ nautilus_dbus_file_operations_complete_copy_uris (object, invocation);
+ return TRUE; /* invocation was handled */
+}
+
+static gboolean
+handle_move_uris (NautilusDBusFileOperations *object,
+ GDBusMethodInvocation *invocation,
+ const gchar **sources,
+ const gchar *destination)
+{
+ GList *source_files = NULL;
+ gint idx;
+
+ for (idx = 0; sources[idx] != NULL; idx++)
+ {
+ source_files = g_list_prepend (source_files, g_strdup (sources[idx]));
+ }
+
+ g_application_hold (g_application_get_default ());
+ nautilus_file_operations_copy_move (source_files, destination,
+ GDK_ACTION_MOVE, NULL, copy_move_on_finished, NULL);
g_list_free_full (source_files, g_free);
nautilus_dbus_file_operations_complete_copy_uris (object, invocation);
@@ -254,8 +243,8 @@ nautilus_dbus_manager_init (NautilusDBusManager *self)
G_CALLBACK (handle_copy_uris),
self);
g_signal_connect (self->file_operations,
- "handle-copy-file",
- G_CALLBACK (handle_copy_file),
+ "handle-move-uris",
+ G_CALLBACK (handle_move_uris),
self);
g_signal_connect (self->file_operations,
"handle-empty-trash",
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index cf5e7f46b..e306e7eff 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -5705,47 +5705,6 @@ copy_task_thread_func (GTask *task,
&source_info, &transfer_info);
}
-void
-nautilus_file_operations_copy_file (GFile *source_file,
- GFile *target_dir,
- const gchar *source_display_name,
- const gchar *new_name,
- GtkWindow *parent_window,
- NautilusCopyCallback done_callback,
- gpointer done_callback_data)
-{
- GTask *task;
- CopyMoveJob *job;
-
- job = op_job_new (CopyMoveJob, parent_window);
- job->done_callback = done_callback;
- job->done_callback_data = done_callback_data;
- job->files = g_list_append (NULL, g_object_ref (source_file));
- job->destination = g_object_ref (target_dir);
- /* Need to indicate the destination for the operation notification open
- * button. */
- nautilus_progress_info_set_destination (((CommonJob *) job)->progress, target_dir);
- job->target_name = g_strdup (new_name);
- job->debuting_files = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, g_object_unref, NULL);
-
- if (source_display_name != NULL)
- {
- gchar *path;
-
- path = g_build_filename ("/", source_display_name, NULL);
- job->fake_display_source = g_file_new_for_path (path);
-
- g_free (path);
- }
-
- inhibit_power_manager ((CommonJob *) job, _("Copying Files"));
-
- task = g_task_new (NULL, job->common.cancellable, copy_task_done, job);
- g_task_set_task_data (task, job, NULL);
- g_task_run_in_thread (task, copy_task_thread_func);
- g_object_unref (task);
-}
-
void
nautilus_file_operations_copy (GList *files,
GFile *target_dir,
diff --git a/src/nautilus-file-operations.h b/src/nautilus-file-operations.h
index e8c6ed393..2a9c6a6a0 100644
--- a/src/nautilus-file-operations.h
+++ b/src/nautilus-file-operations.h
@@ -57,13 +57,6 @@ void nautilus_file_operations_copy_move (const GList *item_uris,
GtkWidget *parent_view,
NautilusCopyCallback done_callback,
gpointer done_callback_data);
-void nautilus_file_operations_copy_file (GFile *source_file,
- GFile *target_dir,
- const gchar *source_display_name,
- const gchar *new_name,
- GtkWindow *parent_window,
- NautilusCopyCallback done_callback,
- gpointer done_callback_data);
void nautilus_file_operations_empty_trash (GtkWidget *parent_view);
void nautilus_file_operations_new_folder (GtkWidget *parent_view,
const char *parent_dir_uri,
--
2.17.1

View File

@ -1,28 +0,0 @@
From 60ba10283b631f08bd7e763a63a1a8e048b66379 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@gnome.org>
Date: Wed, 8 Aug 2018 14:07:48 +0200
Subject: [PATCH 09/11] dbus: Implement move operation
Analog to the copy operation.
---
data/dbus-interfaces.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 20ffadde1..64176225c 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -27,6 +27,10 @@
<arg type='as' name='SourceFilesURIList' direction='in'/>
<arg type='s' name='DestinationDirectoryURI' direction='in'/>
</method>
+ <method name='MoveURIs'>
+ <arg type='as' name='SourceFilesURIList' direction='in'/>
+ <arg type='s' name='DestinationDirectoryURI' direction='in'/>
+ </method>
<method name='EmptyTrash'>
</method>"
<method name='TrashFiles'>
--
2.17.1

View File

@ -1,45 +0,0 @@
From 7cea30b7357cf246cbab67e895c90ebb5cc6a772 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@gnome.org>
Date: Wed, 8 Aug 2018 14:32:00 +0200
Subject: [PATCH 10/11] dbus-manager: Fix double free
nautilus_undo_manager_get doesn't return a new reference, so we
shouldn't use g_autoptr.
---
src/nautilus-dbus-manager.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 1ac6e12c2..728b1dea2 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -64,7 +64,7 @@ nautilus_dbus_manager_dispose (GObject *object)
static void
undo_redo_on_finished (gpointer user_data)
{
- g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
+ NautilusFileUndoManager *undo_manager = NULL;
int *handler_id = (int *) user_data;
undo_manager = nautilus_file_undo_manager_get ();
@@ -77,7 +77,7 @@ static gboolean
handle_redo (NautilusDBusFileOperations *object,
GDBusMethodInvocation *invocation)
{
- g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
+ NautilusFileUndoManager *undo_manager = NULL;
gint *handler_id = g_new0(int, 1);
undo_manager = nautilus_file_undo_manager_get ();
@@ -94,7 +94,7 @@ static gboolean
handle_undo (NautilusDBusFileOperations *object,
GDBusMethodInvocation *invocation)
{
- g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
+ NautilusFileUndoManager *undo_manager = NULL;
gint *handler_id = g_new0(int, 1);
undo_manager = nautilus_file_undo_manager_get ();
--
2.17.1

View File

@ -1,36 +0,0 @@
From 12fa036ee7689774cfdf941ae7fda04d18d34ae8 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@gnome.org>
Date: Wed, 8 Aug 2018 14:32:56 +0200
Subject: [PATCH 11/11] dbus-manager: Fix not holding application
The code was releasing it on the callback but forgot to put the hold
on the initial call.
---
src/nautilus-dbus-manager.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 728b1dea2..f11ede0ad 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -80,6 +80,8 @@ handle_redo (NautilusDBusFileOperations *object,
NautilusFileUndoManager *undo_manager = NULL;
gint *handler_id = g_new0(int, 1);
+ g_application_hold (g_application_get_default ());
+
undo_manager = nautilus_file_undo_manager_get ();
*handler_id = g_signal_connect_swapped (undo_manager, "undo-changed",
G_CALLBACK (undo_redo_on_finished),
@@ -97,6 +99,8 @@ handle_undo (NautilusDBusFileOperations *object,
NautilusFileUndoManager *undo_manager = NULL;
gint *handler_id = g_new0(int, 1);
+ g_application_hold (g_application_get_default ());
+
undo_manager = nautilus_file_undo_manager_get ();
*handler_id = g_signal_connect_swapped (undo_manager, "undo-changed",
G_CALLBACK (undo_redo_on_finished),
--
2.17.1

View File

@ -1,552 +0,0 @@
From 228971be31f92625f641531e1b78b8c8e63677b0 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Tue, 31 Jul 2018 22:10:03 +0200
Subject: [PATCH] clipboard: Use text based clipboard only
---
src/nautilus-canvas-view.c | 13 ++++++-------
src/nautilus-clipboard.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------
src/nautilus-clipboard.h | 5 +++--
src/nautilus-files-view.c | 112 +++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------
src/nautilus-list-view.c | 13 ++++++-------
5 files changed, 102 insertions(+), 154 deletions(-)
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index f99ddd9..7de0808 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -549,9 +549,9 @@ nautilus_canvas_view_begin_loading (NautilusFilesView *view)
}
static void
-on_clipboard_contents_received (GtkClipboard *clipboard,
- GtkSelectionData *selection_data,
- gpointer user_data)
+on_clipboard_contents_received (GtkClipboard *clipboard,
+ const gchar *selection_data,
+ gpointer user_data)
{
NautilusCanvasView *canvas_view;
@@ -590,10 +590,9 @@ static void
update_clipboard_status (NautilusCanvasView *view)
{
g_object_ref (view); /* Need to keep the object alive until we get the reply */
- gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)),
- nautilus_clipboard_get_atom (),
- on_clipboard_contents_received,
- view);
+ gtk_clipboard_request_text (nautilus_clipboard_get (GTK_WIDGET (view)),
+ on_clipboard_contents_received,
+ view);
}
static void
diff --git a/src/nautilus-clipboard.c b/src/nautilus-clipboard.c
index 267d7a3..752ff13 100644
--- a/src/nautilus-clipboard.c
+++ b/src/nautilus-clipboard.c
@@ -33,30 +33,32 @@
#include <gtk/gtk.h>
#include <string.h>
-static GdkAtom copied_files_atom;
-
typedef struct
{
gboolean cut;
GList *files;
} ClipboardInfo;
static GList *
-convert_lines_to_str_list (char **lines)
+convert_selection_data_to_str_list (const gchar *data)
{
int i;
GList *result;
+ size_t number_of_lines;
+ gchar **lines;
- if (lines[0] == NULL)
- {
- return NULL;
- }
-
+ lines = g_strsplit (data, "\n", 0);
result = NULL;
- for (i = 0; lines[i] != NULL; i++)
+ number_of_lines = g_strv_length (lines);
+ /* Also, this skips the last line, since it would be an
+ * empty string from the split */
+ for (i = 0; i < number_of_lines - 1; i++)
{
result = g_list_prepend (result, g_strdup (lines[i]));
}
+
+ g_strfreev (lines);
+
return g_list_reverse (result);
}
@@ -77,7 +79,8 @@ convert_file_list_to_string (ClipboardInfo *info,
}
else
{
- uris = g_string_new (info->cut ? "cut" : "copy");
+ uris = g_string_new ("x-special/nautilus-clipboard\n");
+ g_string_append (uris, info->cut ? "cut\n" : "copy\n");
}
for (i = 0, l = info->files; l != NULL; l = l->next, i++)
@@ -100,16 +103,12 @@ convert_file_list_to_string (ClipboardInfo *info,
g_string_append (uris, uri);
}
- /* skip newline for last element */
- if (i + 1 < g_list_length (info->files))
- {
- g_string_append_c (uris, '\n');
- }
+ g_string_append_c (uris, '\n');
}
else
{
- g_string_append_c (uris, '\n');
g_string_append (uris, uri);
+ g_string_append_c (uris, '\n');
}
g_free (uri);
@@ -120,43 +119,60 @@ convert_file_list_to_string (ClipboardInfo *info,
}
static GList *
-get_item_list_from_selection_data (GtkSelectionData *selection_data)
+get_item_list_from_selection_data (const gchar *selection_data)
{
- GList *items;
- char **lines;
+ GList *items = NULL;
- if (gtk_selection_data_get_data_type (selection_data) != copied_files_atom
- || gtk_selection_data_get_length (selection_data) <= 0)
+ if (selection_data != NULL)
{
- items = NULL;
- }
- else
- {
- gchar *data;
+ gboolean valid_data = TRUE;
/* Not sure why it's legal to assume there's an extra byte
* past the end of the selection data that it's safe to write
* to. But gtk_editable_selection_received does this, so I
* think it is OK.
*/
- data = (gchar *) gtk_selection_data_get_data (selection_data);
- data[gtk_selection_data_get_length (selection_data)] = '\0';
- lines = g_strsplit (data, "\n", 0);
- items = convert_lines_to_str_list (lines);
- g_strfreev (lines);
+ items = convert_selection_data_to_str_list (selection_data);
+ if (items == NULL || g_strcmp0 (items->data, "x-special/nautilus-clipboard") != 0)
+ {
+ valid_data = FALSE;
+ }
+ else if (items->next == NULL)
+ {
+ valid_data = FALSE;
+ }
+ else if (g_strcmp0 (items->next->data, "cut") != 0 &&
+ g_strcmp0 (items->next->data, "copy") != 0)
+ {
+ valid_data = FALSE;
+ }
+
+ if (!valid_data)
+ {
+ g_list_free_full (items, g_free);
+ items = NULL;
+ }
}
return items;
}
+gboolean
+nautilus_clipboard_is_data_valid_from_selection_data (const gchar *selection_data)
+{
+ return nautilus_clipboard_get_uri_list_from_selection_data (selection_data) != NULL;
+}
+
GList *
-nautilus_clipboard_get_uri_list_from_selection_data (GtkSelectionData *selection_data)
+nautilus_clipboard_get_uri_list_from_selection_data (const gchar *selection_data)
{
GList *items;
items = get_item_list_from_selection_data (selection_data);
if (items)
{
- /* Line 0 is "cut" or "copy", so uris start at line 1. */
+ /* Line 0 is x-special/nautilus-clipboard. */
+ items = g_list_remove (items, items->data);
+ /* Line 1 is "cut" or "copy", so uris start at line 2. */
items = g_list_remove (items, items->data);
}
@@ -174,13 +190,12 @@ void
nautilus_clipboard_clear_if_colliding_uris (GtkWidget *widget,
const GList *item_uris)
{
- GtkSelectionData *data;
+ g_autofree gchar *data = NULL;
GList *clipboard_item_uris, *l;
gboolean collision;
collision = FALSE;
- data = gtk_clipboard_wait_for_contents (nautilus_clipboard_get (widget),
- copied_files_atom);
+ data = gtk_clipboard_wait_for_text (nautilus_clipboard_get (widget));
if (data == NULL)
{
return;
@@ -210,14 +225,14 @@ nautilus_clipboard_clear_if_colliding_uris (GtkWidget *widget,
}
gboolean
-nautilus_clipboard_is_cut_from_selection_data (GtkSelectionData *selection_data)
+nautilus_clipboard_is_cut_from_selection_data (const gchar *selection_data)
{
GList *items;
gboolean is_cut_from_selection_data;
items = get_item_list_from_selection_data (selection_data);
is_cut_from_selection_data = items != NULL &&
- g_strcmp0 ((gchar *) items->data, "cut") == 0;
+ g_strcmp0 ((gchar *) items->next->data, "cut") == 0;
g_list_free_full (items, g_free);
@@ -262,17 +277,8 @@ on_get_clipboard (GtkClipboard *clipboard,
char *str;
gsize len;
- str = convert_file_list_to_string (clipboard_info, TRUE, &len);
- gtk_selection_data_set_text (selection_data, str, len);
- g_free (str);
- }
- else if (target == copied_files_atom)
- {
- char *str;
- gsize len;
-
str = convert_file_list_to_string (clipboard_info, FALSE, &len);
- gtk_selection_data_set (selection_data, copied_files_atom, 8, (guchar *) str, len);
+ gtk_selection_data_set_text (selection_data, str, len);
g_free (str);
}
}
@@ -303,7 +309,6 @@ nautilus_clipboard_prepare_for_files (GtkClipboard *clipboard,
clipboard_info->files = nautilus_file_list_copy (files);
target_list = gtk_target_list_new (NULL, 0);
- gtk_target_list_add (target_list, copied_files_atom, 0, 0);
gtk_target_list_add_uri_targets (target_list, 0);
gtk_target_list_add_text_targets (target_list, 0);
@@ -317,13 +322,3 @@ nautilus_clipboard_prepare_for_files (GtkClipboard *clipboard,
gtk_target_table_free (targets, n_targets);
}
-GdkAtom
-nautilus_clipboard_get_atom (void)
-{
- if (!copied_files_atom)
- {
- copied_files_atom = gdk_atom_intern_static_string ("x-special/gnome-copied-files");
- }
-
- return copied_files_atom;
-}
diff --git a/src/nautilus-clipboard.h b/src/nautilus-clipboard.h
index 613e983..3be19c9 100644
--- a/src/nautilus-clipboard.h
+++ b/src/nautilus-clipboard.h
@@ -28,11 +28,12 @@
void nautilus_clipboard_clear_if_colliding_uris (GtkWidget *widget,
const GList *item_uris);
GtkClipboard* nautilus_clipboard_get (GtkWidget *widget);
-GList* nautilus_clipboard_get_uri_list_from_selection_data (GtkSelectionData *selection_data);
-gboolean nautilus_clipboard_is_cut_from_selection_data (GtkSelectionData *selection_data);
+GList* nautilus_clipboard_get_uri_list_from_selection_data (const gchar *selection_data);
+gboolean nautilus_clipboard_is_cut_from_selection_data (const gchar *selection_data);
void nautilus_clipboard_prepare_for_files (GtkClipboard *clipboard,
GList *files,
gboolean cut);
GdkAtom nautilus_clipboard_get_atom (void);
+gboolean nautilus_clipboard_is_data_valid_from_selection_data (const gchar *selection_data);
#endif /* NAUTILUS_CLIPBOARD_H */
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 8aff33e..a74b691 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -2551,7 +2551,7 @@ action_open_item_new_window (GSimpleAction *action,
static void
handle_clipboard_data (NautilusFilesView *view,
- GtkSelectionData *selection_data,
+ const gchar *selection_data,
char *destination_uri,
GdkDragAction action)
{
@@ -2576,7 +2576,7 @@ handle_clipboard_data (NautilusFilesView *view,
static void
paste_clipboard_data (NautilusFilesView *view,
- GtkSelectionData *selection_data,
+ const gchar *selection_data,
char *destination_uri)
{
GdkDragAction action;
@@ -2594,9 +2594,9 @@ paste_clipboard_data (NautilusFilesView *view,
}
static void
-paste_clipboard_received_callback (GtkClipboard *clipboard,
- GtkSelectionData *selection_data,
- gpointer data)
+paste_clipboard_text_received_callback (GtkClipboard *clipboard,
+ const gchar *selection_data,
+ gpointer data)
{
NautilusFilesView *view;
NautilusFilesViewPrivate *priv;
@@ -2629,16 +2629,15 @@ action_paste_files (GSimpleAction *action,
view = NAUTILUS_FILES_VIEW (user_data);
g_object_ref (view);
- gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)),
- nautilus_clipboard_get_atom (),
- paste_clipboard_received_callback,
- view);
+ gtk_clipboard_request_text (nautilus_clipboard_get (GTK_WIDGET (view)),
+ paste_clipboard_text_received_callback,
+ view);
}
static void
-create_links_clipboard_received_callback (GtkClipboard *clipboard,
- GtkSelectionData *selection_data,
- gpointer data)
+create_links_clipboard_received_callback (GtkClipboard *clipboard,
+ const gchar *selection_data,
+ gpointer data)
{
NautilusFilesView *view;
NautilusFilesViewPrivate *priv;
@@ -2671,10 +2670,9 @@ action_create_links (GSimpleAction *action,
view = NAUTILUS_FILES_VIEW (user_data);
g_object_ref (view);
- gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)),
- nautilus_clipboard_get_atom (),
- create_links_clipboard_received_callback,
- view);
+ gtk_clipboard_request_text (nautilus_clipboard_get (GTK_WIDGET (view)),
+ create_links_clipboard_received_callback,
+ view);
}
static void
@@ -6016,9 +6014,9 @@ typedef struct
} PasteIntoData;
static void
-paste_into_clipboard_received_callback (GtkClipboard *clipboard,
- GtkSelectionData *selection_data,
- gpointer callback_data)
+paste_into_clipboard_received_callback (GtkClipboard *clipboard,
+ const gchar *selection_data,
+ gpointer callback_data)
{
NautilusFilesViewPrivate *priv;
PasteIntoData *data;
@@ -6058,10 +6056,9 @@ paste_into (NautilusFilesView *view,
data->view = g_object_ref (view);
data->target = nautilus_file_ref (target);
- gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)),
- nautilus_clipboard_get_atom (),
- paste_into_clipboard_received_callback,
- data);
+ gtk_clipboard_request_text (nautilus_clipboard_get (GTK_WIDGET (view)),
+ paste_into_clipboard_received_callback,
+ data);
}
static void
@@ -6925,18 +6922,19 @@ can_paste_into_file (NautilusFile *file)
}
static void
-on_clipboard_contents_received (GtkClipboard *clipboard,
- GtkSelectionData *selection_data,
- gpointer user_data)
+on_clipboard_contents_received (GtkClipboard *clipboard,
+ const gchar *selection_data,
+ gpointer user_data)
{
NautilusFilesViewPrivate *priv;
NautilusFilesView *view;
gboolean can_link_from_copied_files;
gboolean settings_show_create_link;
gboolean is_read_only;
gboolean selection_contains_recent;
gboolean selection_contains_starred;
GAction *action;
+ gboolean is_data_valid;
view = NAUTILUS_FILES_VIEW (user_data);
priv = nautilus_files_view_get_instance_private (view);
@@ -6949,77 +6947,41 @@ on_clipboard_contents_received (GtkClipboard *clipboard,
return;
}
+ is_data_valid = nautilus_clipboard_is_data_valid_from_selection_data (selection_data);
settings_show_create_link = g_settings_get_boolean (nautilus_preferences,
NAUTILUS_PREFERENCES_SHOW_CREATE_LINK);
is_read_only = nautilus_files_view_is_read_only (view);
selection_contains_recent = showing_recent_directory (view);
selection_contains_starred = showing_starred_directory (view);
can_link_from_copied_files = !nautilus_clipboard_is_cut_from_selection_data (selection_data) &&
!selection_contains_recent && !selection_contains_starred &&
- !is_read_only && gtk_selection_data_get_length (selection_data) > 0;
+ !is_read_only && selection_data != NULL;
action = g_action_map_lookup_action (G_ACTION_MAP (priv->view_action_group),
"create-link");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
can_link_from_copied_files &&
settings_show_create_link);
- g_object_unref (view);
-}
-
-static void
-on_clipboard_targets_received (GtkClipboard *clipboard,
- GdkAtom *targets,
- int n_targets,
- gpointer user_data)
-{
- NautilusFilesViewPrivate *priv;
- NautilusFilesView *view;
- gboolean is_data_copied;
- int i;
- GAction *action;
-
- view = NAUTILUS_FILES_VIEW (user_data);
- priv = nautilus_files_view_get_instance_private (view);
- is_data_copied = FALSE;
-
- if (priv->slot == NULL ||
- !priv->active)
- {
- /* We've been destroyed or became inactive since call */
- g_object_unref (view);
- return;
- }
-
- if (targets)
- {
- for (i = 0; i < n_targets; i++)
- {
- if (targets[i] == nautilus_clipboard_get_atom ())
- {
- is_data_copied = TRUE;
- }
- }
- }
-
action = g_action_map_lookup_action (G_ACTION_MAP (priv->view_action_group),
"paste");
/* Take into account if the action was previously disabled for other reasons,
* like the directory not being writabble */
g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
- is_data_copied && g_action_get_enabled (action));
+ is_data_valid && g_action_get_enabled (action));
action = g_action_map_lookup_action (G_ACTION_MAP (priv->view_action_group),
"paste-into");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
- is_data_copied && g_action_get_enabled (action));
+ is_data_valid && g_action_get_enabled (action));
action = g_action_map_lookup_action (G_ACTION_MAP (priv->view_action_group),
"create-link");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
- is_data_copied && g_action_get_enabled (action));
+ is_data_valid && g_action_get_enabled (action));
+
g_object_unref (view);
}
@@ -7565,18 +7527,10 @@ real_update_actions_state (NautilusFilesView *view)
!selection_contains_starred &&
priv->templates_present);
- /* Actions that are related to the clipboard need request, request the data
- * and update them once we have the data */
- g_object_ref (view); /* Need to keep the object alive until we get the reply */
- gtk_clipboard_request_targets (nautilus_clipboard_get (GTK_WIDGET (view)),
- on_clipboard_targets_received,
- view);
-
g_object_ref (view); /* Need to keep the object alive until we get the reply */
- gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)),
- nautilus_clipboard_get_atom (),
- on_clipboard_contents_received,
- view);
+ gtk_clipboard_request_text (nautilus_clipboard_get (GTK_WIDGET (view)),
+ on_clipboard_contents_received,
+ view);
action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group),
"select-all");
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index d2ba388..4f65080 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -3628,9 +3628,9 @@ list_view_scroll_to_file (NautilusFilesView *view,
}
static void
-on_clipboard_contents_received (GtkClipboard *clipboard,
- GtkSelectionData *selection_data,
- gpointer user_data)
+on_clipboard_contents_received (GtkClipboard *clipboard,
+ const gchar *selection_data,
+ gpointer user_data)
{
NautilusListView *view = NAUTILUS_LIST_VIEW (user_data);
@@ -3665,10 +3665,9 @@ static void
update_clipboard_status (NautilusListView *view)
{
g_object_ref (view); /* Need to keep the object alive until we get the reply */
- gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)),
- nautilus_clipboard_get_atom (),
- on_clipboard_contents_received,
- view);
+ gtk_clipboard_request_text (nautilus_clipboard_get (GTK_WIDGET (view)),
+ on_clipboard_contents_received,
+ view);
}
static void
--
libgit2 0.26.0

View File

@ -1,78 +0,0 @@
From 90229bd32fde57feb4dd37bc018d47c7a29e7e93 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Sat, 18 Aug 2018 20:31:36 +0200
Subject: [PATCH] dbus-manager: Provide undo status
This is interesting for the desktop icons integration, so it can hide
the undo/redo menu items appropriately.
---
data/dbus-interfaces.xml | 1 +
src/nautilus-dbus-manager.c | 31 +++++++++++++++++++++++++++++--
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 64176225c..078cf24a2 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -43,5 +43,6 @@
</method>
<method name='Redo'>
</method>
+ <property name="UndoStatus" type="i" access="read"/>
</interface>
</node>
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index f11ede0ad..64f004d88 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -237,6 +237,17 @@ handle_trash_files (NautilusDBusFileOperations *object,
return TRUE; /* invocation was handled */
}
+
+static void
+undo_manager_changed (NautilusDBusManager *self)
+{
+ NautilusFileUndoManagerState undo_state;
+
+ undo_state = nautilus_file_undo_manager_get_state ();
+ nautilus_dbus_file_operations_set_undo_status (self->file_operations,
+ undo_state);
+}
+
static void
nautilus_dbus_manager_init (NautilusDBusManager *self)
{
@@ -292,12 +303,28 @@ nautilus_dbus_manager_register (NautilusDBusManager *self,
GDBusConnection *connection,
GError **error)
{
- return g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->file_operations),
- connection, "/org/gnome/Nautilus" PROFILE, error);
+ gboolean succes;
+
+ succes = g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->file_operations),
+ connection, "/org/gnome/Nautilus" PROFILE, error);
+ if (succes)
+ {
+ g_signal_connect_object (nautilus_file_undo_manager_get (),
+ "undo-changed",
+ G_CALLBACK (undo_manager_changed),
+ self,
+ G_CONNECT_SWAPPED);
+
+ undo_manager_changed (self);
+ }
+
+ return succes;
}
void
nautilus_dbus_manager_unregister (NautilusDBusManager *self)
{
g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (self->file_operations));
+
+ g_signal_handlers_disconnect_by_data (nautilus_file_undo_manager_get (), self);
}
--
2.17.1

View File

@ -1,59 +0,0 @@
From f0e34498a2f2e2ec6644a3af47c1b56ac5b6dec3 Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ernestask@gnome.org>
Date: Thu, 2 Aug 2018 22:29:03 +0300
Subject: [PATCH] clipboard: Prevent crash when selection data is empty
Somehow, magically, it can happen that the clipboard contains an empty
string, which wreaks havoc in convert_selection_data_to_str_list(),
since the loop counter goes from 0 to the number of lines in the data
string minus one. This commit adds a check for the number of lines and
returns early. Additionally, this introduces automatic cleanup for a
variable and fixes mismatched types.
---
src/nautilus-clipboard.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/nautilus-clipboard.c b/src/nautilus-clipboard.c
index 752ff131f..2a77cf28f 100644
--- a/src/nautilus-clipboard.c
+++ b/src/nautilus-clipboard.c
@@ -42,23 +42,29 @@ typedef struct
static GList *
convert_selection_data_to_str_list (const gchar *data)
{
- int i;
+ g_auto (GStrv) lines;
+ guint number_of_lines;
GList *result;
- size_t number_of_lines;
- gchar **lines;
lines = g_strsplit (data, "\n", 0);
- result = NULL;
number_of_lines = g_strv_length (lines);
+ if (number_of_lines == 0)
+ {
+ /* An empty string will result in g_strsplit() returning an empty
+ * array, so, naturally, 0 - 1 = UINT32_MAX and we read all sorts
+ * of invalid memory.
+ */
+ return NULL;
+ }
+ result = NULL;
+
/* Also, this skips the last line, since it would be an
* empty string from the split */
- for (i = 0; i < number_of_lines - 1; i++)
+ for (guint i = 0; i < number_of_lines - 1; i++)
{
result = g_list_prepend (result, g_strdup (lines[i]));
}
- g_strfreev (lines);
-
return g_list_reverse (result);
}
--
2.17.2

File diff suppressed because it is too large Load Diff

View File

@ -1,93 +0,0 @@
From 5b40335c34a3b920348633274a03d073d1338a09 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Mon, 9 Jan 2023 13:12:17 +0100
Subject: [PATCH] Revert "application: add common startup code"
This reverts commit 23ae53870a39afe43548111b6432db39511a6e97. This
change was needed for split of desktop-related functionality, but it
seems no more needed to me. Let's revert those changes to make the
code a bit easier as a preparation for the next commits.
---
src/nautilus-application.c | 31 ++++++-------------------------
src/nautilus-application.h | 1 -
2 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 22a01ad..829faa3 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -1250,9 +1250,10 @@ on_application_shutdown (GApplication *application,
nautilus_icon_info_clear_caches ();
}
-void
-nautilus_application_startup_common (NautilusApplication *self)
+static void
+nautilus_application_startup (GApplication *app)
{
+ NautilusApplication *self = NAUTILUS_APPLICATION (app);
NautilusApplicationPrivate *priv;
nautilus_profile_start (NULL);
@@ -1269,6 +1270,9 @@ nautilus_application_startup_common (NautilusApplication *self)
setup_theme_extensions ();
+ /* create DBus manager */
+ priv->fdb_manager = nautilus_freedesktop_dbus_new ();
+
/* initialize preferences and create the global GSettings objects */
nautilus_global_preferences_init ();
@@ -1295,22 +1299,6 @@ nautilus_application_startup_common (NautilusApplication *self)
g_signal_connect (self, "shutdown", G_CALLBACK (on_application_shutdown), NULL);
}
-static void
-nautilus_application_startup (GApplication *app)
-{
- NautilusApplication *self = NAUTILUS_APPLICATION (app);
- NautilusApplicationPrivate *priv;
-
- nautilus_profile_start (NULL);
- priv = nautilus_application_get_instance_private (self);
-
- /* create DBus manager */
- priv->fdb_manager = nautilus_freedesktop_dbus_new ();
- nautilus_application_startup_common (self);
-
- nautilus_profile_end (NULL);
-}
-
static gboolean
nautilus_application_dbus_register (GApplication *app,
GDBusConnection *connection,
@@ -1374,13 +1362,6 @@ update_dbus_opened_locations (NautilusApplication *self)
priv = nautilus_application_get_instance_private (self);
- /* Children of nautilus application could not handle the dbus, so don't
- * do anything in that case */
- if (!priv->fdb_manager)
- {
- return;
- }
-
for (l = priv->windows; l != NULL; l = l->next)
{
window = l->data;
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index 197a276..5f15f06 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -88,7 +88,6 @@ GtkWidget * nautilus_application_connect_server (NautilusApplication *applicatio
void nautilus_application_search (NautilusApplication *application,
const gchar *uri,
const gchar *text);
-void nautilus_application_startup_common (NautilusApplication *application);
G_END_DECLS
#endif /* __NAUTILUS_APPLICATION_H__ */
--
2.38.1

View File

@ -1,90 +0,0 @@
From bac4bd595c518983571b0fb41fcf5586f27544eb Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Mon, 19 Nov 2018 08:55:22 +0000
Subject: [PATCH] dbus: Implement rename file
So desktop icons extensions can use it.
(cherry picked from commit 42c5ce657e2b24ddf19932e9e3284a045d60ff51)
---
data/dbus-interfaces.xml | 4 ++++
src/nautilus-dbus-manager.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 298871bc4..1827f92ab 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -39,6 +39,10 @@
<method name='CreateFolder'>
<arg type='s' name='URI' direction='in'/>
</method>
+ <method name='RenameFile'>
+ <arg type='s' name='URI' direction='in'/>
+ <arg type='s' name='NewName' direction='in'/>
+ </method>
<method name='Undo'>
</method>
<method name='Redo'>
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 3257c4bd4..43f27e10a 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -27,6 +27,7 @@
#include "nautilus-file-operations.h"
#include "nautilus-file-undo-manager.h"
+#include "nautilus-file.h"
#define DEBUG_FLAG NAUTILUS_DEBUG_DBUS
#include "nautilus-debug.h"
@@ -230,6 +231,34 @@ handle_trash_files (NautilusDBusFileOperations *object,
return TRUE; /* invocation was handled */
}
+static void
+rename_file_on_finished (NautilusFile *file,
+ GFile *result_location,
+ GError *error,
+ gpointer callback_data)
+{
+ g_application_release (g_application_get_default ());
+}
+
+static gboolean
+handle_rename_file (NautilusDBusFileOperations *object,
+ GDBusMethodInvocation *invocation,
+ const gchar *uri,
+ const gchar *new_name)
+{
+ NautilusFile *file = NULL;
+
+ file = nautilus_file_get_by_uri (uri);
+
+ g_application_hold (g_application_get_default ());
+ nautilus_file_rename (file, new_name,
+ rename_file_on_finished, NULL);
+
+ nautilus_dbus_file_operations_complete_rename_file (object, invocation);
+
+ return TRUE; /* invocation was handled */
+}
+
static void
undo_manager_changed (NautilusDBusManager *self)
@@ -266,6 +295,10 @@ nautilus_dbus_manager_init (NautilusDBusManager *self)
"handle-create-folder",
G_CALLBACK (handle_create_folder),
self);
+ g_signal_connect (self->file_operations,
+ "handle-rename-file",
+ G_CALLBACK (handle_rename_file),
+ self);
g_signal_connect (self->file_operations,
"handle-undo",
G_CALLBACK (handle_undo),
--
2.18.1

View File

@ -1,19 +0,0 @@
diff --git a/data/org.gnome.Nautilus.appdata.xml.in.in b/data/org.gnome.Nautilus.appdata.xml.in.in
index 1e3986323..35e54cb14 100644
--- a/data/org.gnome.Nautilus.appdata.xml.in.in
+++ b/data/org.gnome.Nautilus.appdata.xml.in.in
@@ -2,11 +2,11 @@
<id>@appid@.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license>
- <name>Nautilus</name>
+ <name>Files</name>
<summary>Access and organize files</summary>
<description>
<p>
- Nautilus, also known as Files, is the default file manager of the GNOME desktop.
+ Files, also known as Nautilus, is the default file manager of the GNOME desktop.
It provides a simple and integrated way of managing your files and browsing your file system.
</p>
<p>

View File

@ -1,304 +0,0 @@
From 1fa3039c67671fe53416b2575f3c305029ef4854 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Wed, 11 Jan 2023 09:55:41 +0100
Subject: [PATCH] application: Export FileManager1 iface from dbus_register
vfunc
The `org/freedesktop/FileManager1` interface is not currently exported
from the `dbus_register` vfunc. This causes issues for projects (e.g.
desktop-icons extension) that want to use all the Nautilus intefaces
over the `org.gnome.Nautilus` connection. Let's use the already established
connection and export the `FileManager1` interface from the `dbus_register`
vfunc.
https://bugzilla.redhat.com/show_bug.cgi?id=2150894
---
src/nautilus-application.c | 17 ++--
src/nautilus-freedesktop-dbus.c | 150 +++++++++++++++++++++++++-------
src/nautilus-freedesktop-dbus.h | 6 +-
3 files changed, 136 insertions(+), 37 deletions(-)
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 829faa3..3bb3da1 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -608,8 +608,6 @@ nautilus_application_finalize (GObject *object)
g_clear_object (&priv->progress_handler);
g_clear_object (&priv->bookmark_list);
- g_clear_object (&priv->fdb_manager);
-
g_list_free (priv->windows);
g_hash_table_destroy (priv->notifications);
@@ -1270,9 +1268,6 @@ nautilus_application_startup (GApplication *app)
setup_theme_extensions ();
- /* create DBus manager */
- priv->fdb_manager = nautilus_freedesktop_dbus_new ();
-
/* initialize preferences and create the global GSettings objects */
nautilus_global_preferences_init ();
@@ -1315,6 +1310,12 @@ nautilus_application_dbus_register (GApplication *app,
return FALSE;
}
+ priv->fdb_manager = nautilus_freedesktop_dbus_new (connection);
+ if (!nautilus_freedesktop_dbus_register (priv->fdb_manager, error))
+ {
+ return FALSE;
+ }
+
priv->search_provider = nautilus_shell_search_provider_new ();
if (!nautilus_shell_search_provider_register (priv->search_provider, connection, error))
{
@@ -1339,6 +1340,12 @@ nautilus_application_dbus_unregister (GApplication *app,
g_clear_object (&priv->dbus_manager);
}
+ if (priv->fdb_manager)
+ {
+ nautilus_freedesktop_dbus_unregister (priv->fdb_manager);
+ g_clear_object (&priv->fdb_manager);
+ }
+
if (priv->search_provider)
{
nautilus_shell_search_provider_unregister (priv->search_provider);
diff --git a/src/nautilus-freedesktop-dbus.c b/src/nautilus-freedesktop-dbus.c
index b888099..d013e20 100644
--- a/src/nautilus-freedesktop-dbus.c
+++ b/src/nautilus-freedesktop-dbus.c
@@ -41,6 +41,14 @@ struct _NautilusFreedesktopDBus
/* Our DBus implementation skeleton */
NautilusFreedesktopFileManager1 *skeleton;
+
+ GDBusConnection *connection;
+};
+
+enum
+{
+ PROP_0,
+ PROP_CONNECTION,
};
struct _NautilusFreedesktopDBusClass
@@ -149,27 +157,6 @@ skeleton_handle_show_item_properties_cb (NautilusFreedesktopFileManager1 *object
return TRUE;
}
-static void
-bus_acquired_cb (GDBusConnection *conn,
- const gchar *name,
- gpointer user_data)
-{
- NautilusFreedesktopDBus *fdb = user_data;
-
- DEBUG ("Bus acquired at %s", name);
-
- fdb->skeleton = nautilus_freedesktop_file_manager1_skeleton_new ();
-
- g_signal_connect (fdb->skeleton, "handle-show-items",
- G_CALLBACK (skeleton_handle_show_items_cb), fdb);
- g_signal_connect (fdb->skeleton, "handle-show-folders",
- G_CALLBACK (skeleton_handle_show_folders_cb), fdb);
- g_signal_connect (fdb->skeleton, "handle-show-item-properties",
- G_CALLBACK (skeleton_handle_show_item_properties_cb), fdb);
-
- g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (fdb->skeleton), conn, NAUTILUS_FDO_DBUS_PATH, NULL);
-}
-
static void
name_acquired_cb (GDBusConnection *connection,
const gchar *name,
@@ -186,6 +173,20 @@ name_lost_cb (GDBusConnection *connection,
DEBUG ("Lost (or failed to acquire) the name %s on the session message bus\n", name);
}
+static void
+nautilus_freedesktop_dbus_constructed (GObject *object)
+{
+ NautilusFreedesktopDBus *fdb = NAUTILUS_FREEDESKTOP_DBUS (object);
+
+ fdb->owner_id = g_bus_own_name_on_connection (fdb->connection,
+ NAUTILUS_FDO_DBUS_NAME,
+ G_BUS_NAME_OWNER_FLAGS_NONE,
+ name_acquired_cb,
+ name_lost_cb,
+ fdb,
+ NULL);
+}
+
static void
nautilus_freedesktop_dbus_dispose (GObject *object)
{
@@ -199,33 +200,87 @@ nautilus_freedesktop_dbus_dispose (GObject *object)
if (fdb->skeleton != NULL)
{
- g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (fdb->skeleton));
g_object_unref (fdb->skeleton);
fdb->skeleton = NULL;
}
+ g_clear_object (&fdb->connection);
+
G_OBJECT_CLASS (nautilus_freedesktop_dbus_parent_class)->dispose (object);
}
+static void
+nautilus_freedesktop_dbus_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ NautilusFreedesktopDBus *fdb = NAUTILUS_FREEDESKTOP_DBUS (object);
+
+ switch (prop_id)
+ {
+ case PROP_CONNECTION:
+ {
+ g_set_object (&fdb->connection, g_value_get_object (value));
+ }
+ break;
+
+ default:
+ {
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+ break;
+ }
+}
+
+static void
+nautilus_freedesktop_dbus_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ NautilusFreedesktopDBus *fdb = NAUTILUS_FREEDESKTOP_DBUS (object);
+
+ switch (prop_id)
+ {
+ case PROP_CONNECTION:
+ {
+ g_value_set_object (value, fdb->connection);
+ }
+ break;
+
+ default:
+ {
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+ break;
+ }
+}
+
static void
nautilus_freedesktop_dbus_class_init (NautilusFreedesktopDBusClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = nautilus_freedesktop_dbus_dispose;
+ object_class->constructed = nautilus_freedesktop_dbus_constructed;
+ object_class->get_property = nautilus_freedesktop_dbus_get_property;
+ object_class->set_property = nautilus_freedesktop_dbus_set_property;
+
+ g_object_class_install_property (object_class,
+ PROP_CONNECTION,
+ g_param_spec_object ("connection",
+ "Connection",
+ "GDBus connection property",
+ G_TYPE_DBUS_CONNECTION,
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_READWRITE));
}
static void
nautilus_freedesktop_dbus_init (NautilusFreedesktopDBus *fdb)
{
- fdb->owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
- NAUTILUS_FDO_DBUS_NAME,
- G_BUS_NAME_OWNER_FLAGS_NONE,
- bus_acquired_cb,
- name_acquired_cb,
- name_lost_cb,
- fdb,
- NULL);
+ fdb->skeleton = nautilus_freedesktop_file_manager1_skeleton_new ();
}
void
@@ -239,8 +294,41 @@ nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb,
/* Tries to own the org.freedesktop.FileManager1 service name */
NautilusFreedesktopDBus *
-nautilus_freedesktop_dbus_new (void)
+nautilus_freedesktop_dbus_new (GDBusConnection *connection)
{
return g_object_new (nautilus_freedesktop_dbus_get_type (),
+ "connection", connection,
NULL);
}
+
+gboolean
+nautilus_freedesktop_dbus_register (NautilusFreedesktopDBus *fdb,
+ GError **error)
+{
+ gboolean success;
+
+ success = g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (fdb->skeleton),
+ fdb->connection,
+ NAUTILUS_FDO_DBUS_PATH,
+ error);
+
+ if (success)
+ {
+ g_signal_connect (fdb->skeleton, "handle-show-items",
+ G_CALLBACK (skeleton_handle_show_items_cb), fdb);
+ g_signal_connect (fdb->skeleton, "handle-show-folders",
+ G_CALLBACK (skeleton_handle_show_folders_cb), fdb);
+ g_signal_connect (fdb->skeleton, "handle-show-item-properties",
+ G_CALLBACK (skeleton_handle_show_item_properties_cb), fdb);
+ }
+
+ return success;
+}
+
+void
+nautilus_freedesktop_dbus_unregister (NautilusFreedesktopDBus *fdb)
+{
+ g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (fdb->skeleton));
+
+ g_signal_handlers_disconnect_by_data (fdb->skeleton, fdb);
+}
diff --git a/src/nautilus-freedesktop-dbus.h b/src/nautilus-freedesktop-dbus.h
index 410c420..ee2ced5 100644
--- a/src/nautilus-freedesktop-dbus.h
+++ b/src/nautilus-freedesktop-dbus.h
@@ -23,6 +23,7 @@
#define __NAUTILUS_FREEDESKTOP_DBUS_H__
#include <glib-object.h>
+#include <gio/gio.h>
#define NAUTILUS_FDO_DBUS_IFACE "org.freedesktop.FileManager1"
#define NAUTILUS_FDO_DBUS_NAME "org.freedesktop.FileManager1"
@@ -44,7 +45,10 @@ typedef struct _NautilusFreedesktopDBus NautilusFreedesktopDBus;
typedef struct _NautilusFreedesktopDBusClass NautilusFreedesktopDBusClass;
GType nautilus_freedesktop_dbus_get_type (void);
-NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (void);
+NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (GDBusConnection *connection);
+
+gboolean nautilus_freedesktop_dbus_register (NautilusFreedesktopDBus *fdb, GError **error);
+void nautilus_freedesktop_dbus_unregister (NautilusFreedesktopDBus *fdb);
void nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb, const gchar **locations);
--
2.38.1

View File

@ -1,44 +0,0 @@
From 51b543cd5106a8b929b336bc6779eddd4d2ac780 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Thu, 11 Apr 2019 12:36:21 +0100
Subject: [PATCH] data: Fix caption capitalisation in appdata file
Make the capitalisation of the image captions match the translatable
titles of the dialogues in the images, so that translations can be
reused.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
data/org.gnome.Nautilus.appdata.xml.in.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/org.gnome.Nautilus.appdata.xml.in.in b/data/org.gnome.Nautilus.appdata.xml.in.in
index cb20fa05f..cfc27e533 100644
--- a/data/org.gnome.Nautilus.appdata.xml.in.in
+++ b/data/org.gnome.Nautilus.appdata.xml.in.in
@@ -28,11 +28,11 @@
<screenshots>
<screenshot type="default">
<image>https://static.gnome.org/appdata/nautilus/nautilus-201901141.png</image>
- <caption>Tile view</caption>
+ <caption>Tile View</caption>
</screenshot>
<screenshot>
<image>https://static.gnome.org/appdata/nautilus/nautilus-201901142.png</image>
- <caption>List view</caption>
+ <caption>List View</caption>
</screenshot>
<screenshot>
<image>https://static.gnome.org/appdata/nautilus/nautilus-201901143.png</image>
@@ -40,7 +40,7 @@
</screenshot>
<screenshot>
<image>https://static.gnome.org/appdata/nautilus/nautilus-201901144.png</image>
- <caption>Other locations</caption>
+ <caption>Other Locations</caption>
</screenshot>
</screenshots>
<categories>
--
2.21.0

View File

@ -1,61 +0,0 @@
From 6dd492663cbd3652ebc03d06898f74bacbf87683 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Wed, 3 Jul 2019 11:43:31 +0200
Subject: [PATCH] docs: Add nautilus-autorun-software man page
nautilus-autorun-software is the default "x-content/unix-software"
handler for GNOME desktop. So it is not just internal tool and thus
it should have a man page. Let's add a simple man page for it.
It resolves the following downstream bug:
https://bugzilla.redhat.com/show_bug.cgi?id=1725766
---
docs/meson.build | 1 +
docs/nautilus-autorun-software.1 | 26 ++++++++++++++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 docs/nautilus-autorun-software.1
diff --git a/docs/meson.build b/docs/meson.build
index b039cb631..a54574f3c 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,3 +1,4 @@
install_man('nautilus.1')
+install_man('nautilus-autorun-software.1')
subdir('reference')
diff --git a/docs/nautilus-autorun-software.1 b/docs/nautilus-autorun-software.1
new file mode 100644
index 000000000..9ecbd4adb
--- /dev/null
+++ b/docs/nautilus-autorun-software.1
@@ -0,0 +1,26 @@
+.TH nautilus-autorun-software 1 "3 July 2019"
+
+.SH NAME
+Run Software \- helper tool
+
+.SH SYNOPSIS
+.B nautilus-autorun-software
+.RI "" "mount-uri"
+.br
+
+.SH DESCRIPTION
+.B nautilus-autorun-software
+is a helper tool for the GNOME desktop to start software from media with
+Autostart files.
+.br
+
+It is the default "x-content/unix-software" handler for the GNOME desktop.
+.br
+
+.SH SEE ALSO
+Autostart files are described at
+https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html
+
+.SH BUGS
+Bug reports can be found and filed at
+https://gitlab.gnome.org/GNOME/nautilus/issues
--
2.21.0

View File

@ -1,35 +0,0 @@
From ee035fe0b4257d335687c038bf8b41a64d452d7f Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Mon, 18 Nov 2019 11:34:10 +0100
Subject: [PATCH] file-operations: Honor umask when creating new files
File creation mask should be honored when creating new files from
templates as it is when creating new folders, or dragging raw data. But
it is not because G_FILE_COPY_NONE flag is specified when creating new
files from templates. Let's use G_FILE_COPY_TARGET_DEFAULT_PERMS flag
to ensure that file creation mask is honored in this case as well.
Just note that this behavior is not wanted when copying in general
(although it is also honored by "cp" cmd in this case) as it might have
some unexpected consequences as discussed on:
https://bugzilla.gnome.org/show_bug.cgi?id=167102
---
src/nautilus-file-operations.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index acf65f3cf..a90706e2e 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -7361,7 +7361,7 @@ retry:
{
res = g_file_copy (job->src,
dest,
- G_FILE_COPY_NONE,
+ G_FILE_COPY_TARGET_DEFAULT_PERMS,
common->cancellable,
NULL, NULL,
&error);
--
2.26.0

View File

@ -1,42 +0,0 @@
From e03d731e3dcb8d0f52ffbc6faa188802b742d1e9 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 26 Jan 2023 13:20:51 +0100
Subject: [PATCH] file-utilities: Prevent passing NULL to g_object_unref
The `nautilus_find_existing_uri_in_hierarchy` function calls the
`g_object_unref` with a `NULL` pointer when `g_file_query_info` fails.
This leads to a crash e.g. when parent directory of the currently
opened location is removed. Let's port the code to use `g_autoptr` to
avoid that.
---
src/nautilus-file-utilities.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c
index e8f1ca2fb..1c913dbad 100644
--- a/src/nautilus-file-utilities.c
+++ b/src/nautilus-file-utilities.c
@@ -598,7 +598,6 @@ nautilus_generate_unique_file_in_directory (GFile *directory,
GFile *
nautilus_find_existing_uri_in_hierarchy (GFile *location)
{
- GFileInfo *info;
GFile *tmp;
g_assert (location != NULL);
@@ -606,10 +605,11 @@ nautilus_find_existing_uri_in_hierarchy (GFile *location)
location = g_object_ref (location);
while (location != NULL)
{
+ g_autoptr (GFileInfo) info = NULL;
+
info = g_file_query_info (location,
G_FILE_ATTRIBUTE_STANDARD_NAME,
0, NULL, NULL);
- g_object_unref (info);
if (info != NULL)
{
return location;
--
2.40.0

View File

@ -1,77 +0,0 @@
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 08107a64e..d808b04ff 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -6078,6 +6078,33 @@ action_cut (GSimpleAction *action,
nautilus_file_list_free (selection);
}
+static void
+action_copy_current_location (GSimpleAction *action,
+ GVariant *state,
+ gpointer user_data)
+{
+ NautilusFilesView *view;
+ GtkClipboard *clipboard;
+ GFile *file;
+ gchar *path;
+ NautilusFilesViewPrivate *priv;
+
+ view = NAUTILUS_FILES_VIEW (user_data);
+ priv = nautilus_files_view_get_instance_private (view);
+
+ if (priv->directory_as_file != NULL)
+ {
+ file = nautilus_file_get_location (priv->directory_as_file);
+
+ clipboard = nautilus_clipboard_get (GTK_WIDGET (view));
+ path = g_file_get_parse_name (file);
+ gtk_clipboard_set_text (clipboard, path, -1);
+
+ g_object_unref (file);
+ g_free (path);
+ }
+}
+
static void
action_create_links_in_place (GSimpleAction *action,
GVariant *state,
@@ -6958,6 +6985,7 @@ const GActionEntry view_entries[] =
{ "new-folder", action_new_folder },
{ "select-all", action_select_all },
{ "paste", action_paste_files },
+ { "copy-current-location", action_copy_current_location },
{ "create-link", action_create_links },
{ "new-document" },
/* Selection menu */
@@ -7590,6 +7618,10 @@ real_update_actions_state (NautilusFilesView *view)
g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
can_move_files && !selection_contains_recent &&
!selection_contains_starred);
+ action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group),
+ "copy-current-location");
+ g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
+ !selection_contains_search);
/* Drive menu */
show_mount = (selection != NULL);
diff --git a/src/resources/ui/nautilus-pathbar-context-menu.ui b/src/resources/ui/nautilus-pathbar-context-menu.ui
index 403cf71f6..4d32c1e8e 100644
--- a/src/resources/ui/nautilus-pathbar-context-menu.ui
+++ b/src/resources/ui/nautilus-pathbar-context-menu.ui
@@ -16,6 +16,12 @@
<attribute name="label" translatable="yes">Add to _Bookmarks</attribute>
<attribute name="action">view.bookmark</attribute>
</item>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Copy Location</attribute>
+ <attribute name="action">view.copy-current-location</attribute>
+ </item>
+ </section>
<section>
<item>
<attribute name="label" translatable="yes">_Paste</attribute>
--
2.36.1

View File

@ -1,400 +0,0 @@
diff -ruN nautilus-3.28.1/po/bg.po nautilus-3.28.1.translations/po/bg.po
--- nautilus-3.28.1/po/bg.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/bg.po 2022-09-22 15:47:26.136428703 +0200
@@ -5471,3 +5471,7 @@
#~ msgid "Enter server address…"
#~ msgstr "Въведете адреса на сървъра…"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Копиране на местоположение"
diff -ruN nautilus-3.28.1/po/ca.po nautilus-3.28.1.translations/po/ca.po
--- nautilus-3.28.1/po/ca.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/ca.po 2022-09-22 15:47:26.165428628 +0200
@@ -7061,3 +7061,7 @@
#~ "Amb el Nautilus heu d'haver rebut una còpia de la Llicència Pública "
#~ "General de GNU; si no és així, escriviu a la Free Software Foundation, "
#~ "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Copia la ubicació"
diff -ruN nautilus-3.28.1/po/cs.po nautilus-3.28.1.translations/po/cs.po
--- nautilus-3.28.1/po/cs.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/cs.po 2022-09-22 15:47:26.181428586 +0200
@@ -5665,3 +5665,7 @@
#~ msgid "org.gnome.Nautilus"
#~ msgstr "org.gnome.Nautilus"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "Z_kopírovat umístění"
diff -ruN nautilus-3.28.1/po/da.po nautilus-3.28.1.translations/po/da.po
--- nautilus-3.28.1/po/da.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/da.po 2022-09-22 15:47:26.193428555 +0200
@@ -7097,3 +7097,7 @@
#~ msgid "link"
#~ msgstr "henvisning"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Kopiér placering"
diff -ruN nautilus-3.28.1/po/de.po nautilus-3.28.1.translations/po/de.po
--- nautilus-3.28.1/po/de.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/de.po 2022-09-22 15:47:26.201428534 +0200
@@ -5716,3 +5716,7 @@
#~ msgid "org.gnome.Nautilus"
#~ msgstr "org.gnome.Nautilus"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "Ort _kopieren"
diff -ruN nautilus-3.28.1/po/el.po nautilus-3.28.1.translations/po/el.po
--- nautilus-3.28.1/po/el.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/el.po 2022-09-22 15:47:26.214428501 +0200
@@ -5910,3 +5910,8 @@
#~ msgstr ""
#~ "Ορίστε αυτό το όνομα αν θέλετε προσαρμοσμένο όνομα για το εικονίδιο του "
#~ "προσωπικού φακέλου στην επιφάνεια εργασίας."
+
+#
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Αντιγραφή τοποθεσίας"
diff -ruN nautilus-3.28.1/po/en_GB.po nautilus-3.28.1.translations/po/en_GB.po
--- nautilus-3.28.1/po/en_GB.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/en_GB.po 2022-09-22 15:47:26.228428464 +0200
@@ -9935,3 +9935,7 @@
#~ msgid "Question"
#~ msgstr "Question"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Copy Location"
diff -ruN nautilus-3.28.1/po/es.po nautilus-3.28.1.translations/po/es.po
--- nautilus-3.28.1/po/es.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/es.po 2022-09-22 15:47:26.246428418 +0200
@@ -10830,3 +10830,8 @@
#~ msgstr ""
#~ "Nautilus es un shell gráfico para GNOME que facilita la administración de "
#~ "sus archivos y el resto de su sistema."
+
+# src/nautilus-location-bar.c:401
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "Copiar _ubicación"
diff -ruN nautilus-3.28.1/po/eu.po nautilus-3.28.1.translations/po/eu.po
--- nautilus-3.28.1/po/eu.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/eu.po 2022-09-22 15:47:26.257428389 +0200
@@ -8066,3 +8066,7 @@
#~ msgid "Clear contents of Go menu and Back/Forward lists"
#~ msgstr "Joan menuaren eta Atzera/Aurrera zerrenden edukia garbitzen du"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Kopiatu kokalekua"
diff -ruN nautilus-3.28.1/po/fa.po nautilus-3.28.1.translations/po/fa.po
--- nautilus-3.28.1/po/fa.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/fa.po 2022-09-22 15:47:26.268428361 +0200
@@ -10082,3 +10082,7 @@
#~ msgid "C_ancel Remove"
#~ msgstr "ان_صراف از حذف"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_رونوشت از مکان"
diff -ruN nautilus-3.28.1/po/fi.po nautilus-3.28.1.translations/po/fi.po
--- nautilus-3.28.1/po/fi.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/fi.po 2022-09-22 15:47:26.278428335 +0200
@@ -6969,3 +6969,7 @@
#~ msgid "_Up"
#~ msgstr "_Ylös"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "Kopioi si_jainti"
diff -ruN nautilus-3.28.1/po/fr.po nautilus-3.28.1.translations/po/fr.po
--- nautilus-3.28.1/po/fr.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/fr.po 2022-09-22 15:47:26.286428314 +0200
@@ -5975,3 +5975,7 @@
#~ msgid "Copying “%B” to “%B”"
#~ msgstr "Copie de « %B » vers « %B »"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "Co_pier lemplacement"
diff -ruN nautilus-3.28.1/po/fur.po nautilus-3.28.1.translations/po/fur.po
--- nautilus-3.28.1/po/fur.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/fur.po 2022-09-22 15:47:26.295428291 +0200
@@ -7711,3 +7711,7 @@
#~ msgid "Set the zoom level of the current view"
#~ msgstr "Imposte il nivel di zoom de viodude atuâl"
+
+#: src/resources/ui/nautilus-files-view-context-menus.ui:34
+msgid "_Copy Location"
+msgstr "_Copie posizion"
diff -ruN nautilus-3.28.1/po/gl.po nautilus-3.28.1.translations/po/gl.po
--- nautilus-3.28.1/po/gl.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/gl.po 2022-09-22 15:47:26.315428239 +0200
@@ -7429,3 +7429,7 @@
#~ msgid "<big><b>Error autorunning software</b></big>"
#~ msgstr "<big><b>Produciuse un erro ao autoexecutar o software</b></big>"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Copiar localización"
diff -ruN nautilus-3.28.1/po/he.po nautilus-3.28.1.translations/po/he.po
--- nautilus-3.28.1/po/he.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/he.po 2022-09-22 15:47:26.336428185 +0200
@@ -10468,3 +10468,7 @@
#~ msgid "Question"
#~ msgstr "שאלה"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "ה_עתקת מיקום"
diff -ruN nautilus-3.28.1/po/hr.po nautilus-3.28.1.translations/po/hr.po
--- nautilus-3.28.1/po/hr.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/hr.po 2022-09-22 15:47:26.349428151 +0200
@@ -6064,3 +6064,7 @@
#~ msgid "Re_verse Order"
#~ msgstr "Ob_rni poredak"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Kopiraj lokaciju"
diff -ruN nautilus-3.28.1/po/hu.po nautilus-3.28.1.translations/po/hu.po
--- nautilus-3.28.1/po/hu.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/hu.po 2022-09-22 15:47:26.358428127 +0200
@@ -5566,3 +5566,8 @@
#~ msgid "org.gnome.Nautilus"
#~ msgstr "org.gnome.Nautilus"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+#| msgid "Location"
+msgid "_Copy Location"
+msgstr "Hely má_solása"
diff -ruN nautilus-3.28.1/po/id.po nautilus-3.28.1.translations/po/id.po
--- nautilus-3.28.1/po/id.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/id.po 2022-09-22 15:47:26.369428099 +0200
@@ -5500,3 +5500,7 @@
#: src/gtk/nautilusgtkplacesview.ui:472
msgid "Enter server address…"
msgstr "Masukkan alamat server…"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Salin Lokasi"
diff -ruN nautilus-3.28.1/po/ka.po nautilus-3.28.1.translations/po/ka.po
--- nautilus-3.28.1/po/ka.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/ka.po 2022-09-22 15:47:26.396428029 +0200
@@ -6877,3 +6877,7 @@
#~ msgid "Video CD"
#~ msgstr "ვიდეო CD ფორმატში"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_მდებარეობის კოპირება"
diff -ruN nautilus-3.28.1/po/kk.po nautilus-3.28.1.translations/po/kk.po
--- nautilus-3.28.1/po/kk.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/kk.po 2022-09-22 15:47:26.405428006 +0200
@@ -7442,3 +7442,7 @@
#~ msgstr ""
#~ "Қоқыс шелегін тазартуды таңдасаңыз, құрамасы жойылады. Оларды жеке-жеке "
#~ "өшіруге болатынын есте сақтаңыз."
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "Орналасуын _көшіріп алу"
diff -ruN nautilus-3.28.1/po/ko.po nautilus-3.28.1.translations/po/ko.po
--- nautilus-3.28.1/po/ko.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/ko.po 2022-09-22 15:47:26.421427964 +0200
@@ -5763,3 +5763,7 @@
#~ msgctxt "shortcut window"
#~ msgid "Bookmarks"
#~ msgstr "책갈피"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "위치 복사(_C)"
diff -ruN nautilus-3.28.1/po/lt.po nautilus-3.28.1.translations/po/lt.po
--- nautilus-3.28.1/po/lt.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/lt.po 2022-09-22 15:47:26.444427904 +0200
@@ -7075,3 +7075,7 @@
#~ msgid "_Up"
#~ msgstr "_Aukštyn"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Kopijuoti vietą"
diff -ruN nautilus-3.28.1/po/lv.po nautilus-3.28.1.translations/po/lv.po
--- nautilus-3.28.1/po/lv.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/lv.po 2022-09-22 15:47:26.453427881 +0200
@@ -5648,3 +5648,8 @@
#~ msgid "org.gnome.Nautilus"
#~ msgstr "org.gnome.Nautilus"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+#| msgid "Location"
+msgid "_Copy Location"
+msgstr "_Kopēt atrašanās vietu"
diff -ruN nautilus-3.28.1/po/nl.po nautilus-3.28.1.translations/po/nl.po
--- nautilus-3.28.1/po/nl.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/nl.po 2022-09-22 15:47:26.504427749 +0200
@@ -6405,3 +6405,7 @@
#~ msgid "Move Dow_n"
#~ msgstr "Naar b_eneden"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "Locatie _kopiëren"
diff -ruN nautilus-3.28.1/po/oc.po nautilus-3.28.1.translations/po/oc.po
--- nautilus-3.28.1/po/oc.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/oc.po 2022-09-22 15:47:26.520427708 +0200
@@ -6999,3 +6999,7 @@
#~ msgid "Rename “%s”"
#~ msgstr "Renomenar lo fichièr « %s »"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Copiar l'emplaçament"
diff -ruN nautilus-3.28.1/po/pl.po nautilus-3.28.1.translations/po/pl.po
--- nautilus-3.28.1/po/pl.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/pl.po 2022-09-22 15:47:26.535427669 +0200
@@ -5683,3 +5683,7 @@
#~ msgid "org.gnome.Nautilus"
#~ msgstr "org.gnome.Nautilus"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "S_kopiuj położenie"
diff -ruN nautilus-3.28.1/po/pt_BR.po nautilus-3.28.1.translations/po/pt_BR.po
--- nautilus-3.28.1/po/pt_BR.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/pt_BR.po 2022-09-22 15:47:26.547427638 +0200
@@ -7152,3 +7152,7 @@
#~ msgid "_Bookmarks..."
#~ msgstr "_Marcadores..."
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Copiar local"
diff -ruN nautilus-3.28.1/po/pt.po nautilus-3.28.1.translations/po/pt.po
--- nautilus-3.28.1/po/pt.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/pt.po 2022-09-22 15:47:26.554427619 +0200
@@ -5944,3 +5944,7 @@
#~ msgid "Whether the row represents a network location"
#~ msgstr "Se a linha representa uma localização de rede"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Copiar localização"
diff -ruN nautilus-3.28.1/po/ru.po nautilus-3.28.1.translations/po/ru.po
--- nautilus-3.28.1/po/ru.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/ru.po 2022-09-22 15:47:26.567427586 +0200
@@ -6177,3 +6177,7 @@
#~ msgctxt "Bookmark"
#~ msgid "_Name"
#~ msgstr "_Имя"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Копировать адрес"
diff -ruN nautilus-3.28.1/po/sl.po nautilus-3.28.1.translations/po/sl.po
--- nautilus-3.28.1/po/sl.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/sl.po 2022-09-22 15:47:26.586427537 +0200
@@ -7338,3 +7338,7 @@
#~ msgid "_About Files"
#~ msgstr "_O programu"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "Kopiraj _mesto"
diff -ruN nautilus-3.28.1/po/sr.po nautilus-3.28.1.translations/po/sr.po
--- nautilus-3.28.1/po/sr.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/sr.po 2022-09-22 15:47:26.605427487 +0200
@@ -7143,3 +7143,7 @@
#~ "ако нисте, пишите Задужбини слободног софтвера на следећу адресу: „Free "
#~ "Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
#~ "02110-1301 USA“"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Копирај путању"
diff -ruN nautilus-3.28.1/po/sv.po nautilus-3.28.1.translations/po/sv.po
--- nautilus-3.28.1/po/sv.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/sv.po 2022-09-22 15:47:26.614427464 +0200
@@ -6343,3 +6343,7 @@
#~ msgid "%a, %b %e %Y %T"
#~ msgstr "%a %-e %b %Y %T"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Kopiera plats"
diff -ruN nautilus-3.28.1/po/tr.po nautilus-3.28.1.translations/po/tr.po
--- nautilus-3.28.1/po/tr.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/tr.po 2022-09-22 15:47:26.640427397 +0200
@@ -6188,3 +6188,7 @@
#~ msgid "D_efault zoom level:"
#~ msgstr "Ön_tanımlı yaklaştırma seviyesi:"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "Konumu _Kopyala"
diff -ruN nautilus-3.28.1/po/uk.po nautilus-3.28.1.translations/po/uk.po
--- nautilus-3.28.1/po/uk.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/uk.po 2022-09-22 15:47:26.652427365 +0200
@@ -7967,3 +7967,7 @@
#~ msgid "Set the zoom level of the current view"
#~ msgstr "Встановити рівень масштабування поточного вікна"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "_Копіювати адресу"
diff -ruN nautilus-3.28.1/po/zh_CN.po nautilus-3.28.1.translations/po/zh_CN.po
--- nautilus-3.28.1/po/zh_CN.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/zh_CN.po 2022-09-22 15:47:26.685427280 +0200
@@ -5495,3 +5495,7 @@
#~ msgid "Zoom In"
#~ msgstr "放大"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "复制位置(_C)"
diff -ruN nautilus-3.28.1/po/zh_TW.po nautilus-3.28.1.translations/po/zh_TW.po
--- nautilus-3.28.1/po/zh_TW.po 2018-04-09 22:02:06.000000000 +0200
+++ nautilus-3.28.1.translations/po/zh_TW.po 2022-09-22 15:47:26.698427246 +0200
@@ -7283,3 +7283,7 @@
#~ "您應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有,寫信"
#~ "給: the Free Software Foundation, Inc., 51 Franklin Street, Fifth "
#~ "Floor, Boston, MA 02110-1301 USA"
+
+#: src/resources/ui/nautilus-pathbar-context-menu.ui:53
+msgid "_Copy Location"
+msgstr "複製位置(_C)"

View File

@ -1,36 +0,0 @@
From 4d7a1a7413cc7e76e99e11def90a6503cc142efb Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Wed, 26 Feb 2020 12:56:39 +0100
Subject: [PATCH] files-view: Clear selection if any files don't match the
pattern
The Select items matching (Ctrl + S) feature allows to select files
which match the pattern. However, it is confusing that current selection
is not cleared when any files don't match the pattern.
---
src/nautilus-files-view.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 5573701cc..f3d507fff 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -1716,12 +1716,12 @@ pattern_select_response_cb (GtkWidget *dialog,
selection = nautilus_directory_match_pattern (directory,
gtk_entry_get_text (GTK_ENTRY (entry)));
+ nautilus_files_view_call_set_selection (view, selection);
+ nautilus_files_view_reveal_selection (view);
+
if (selection)
{
- nautilus_files_view_call_set_selection (view, selection);
nautilus_file_list_free (selection);
-
- nautilus_files_view_reveal_selection (view);
}
/* fall through */
}
--
2.26.0

View File

@ -1,22 +0,0 @@
diff --git a/src/gtk/nautilusgtkplacesview.c b/src/gtk/nautilusgtkplacesview.c
index de0610e52..b72085ba9 100644
--- a/src/gtk/nautilusgtkplacesview.c
+++ b/src/gtk/nautilusgtkplacesview.c
@@ -401,6 +401,9 @@ nautilus_gtk_places_view_destroy (GtkWidget *widget)
if (priv->network_monitor)
g_signal_handlers_disconnect_by_func (priv->network_monitor, update_places, widget);
+ if (priv->server_list_monitor)
+ g_signal_handlers_disconnect_by_func (priv->server_list_monitor, server_file_changed_cb, widget);
+
g_cancellable_cancel (priv->cancellable);
g_cancellable_cancel (priv->networks_fetching_cancellable);
@@ -1405,6 +1407,7 @@ pulse_entry_cb (gpointer user_data)
{
gtk_entry_set_progress_pulse_step (GTK_ENTRY (priv->address_entry), 0.0);
gtk_entry_set_progress_fraction (GTK_ENTRY (priv->address_entry), 0.0);
+ priv->entry_pulse_timeout_id = 0;
return G_SOURCE_REMOVE;
}

View File

@ -1,96 +0,0 @@
From ba878013689114bf199ba2260f9282ae82b352c4 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Wed, 22 Feb 2023 16:22:43 +0100
Subject: [PATCH] freedesktop-dbus: Try to own the name until after exporting
skeleton
Currently, the `g_bus_own_name_on_connection` function is called for the
`org.freedesktop.FileManager1` name before exporting the
`/org/freedesktop/FileManager1` skeleton. This seemingly works fine in most
cases, but occasionally the name is acquired too early and D-Bus clients
can get `No such interface` error. This is regression caused by the commit
2293e813d3cd1cc47b2b8750f7140647aa066fc8. Let's try to own the nam until
after exporting the skeleton to avoid this error.
---
src/nautilus-freedesktop-dbus.c | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/nautilus-freedesktop-dbus.c b/src/nautilus-freedesktop-dbus.c
index c253cfaba..c20166abb 100644
--- a/src/nautilus-freedesktop-dbus.c
+++ b/src/nautilus-freedesktop-dbus.c
@@ -162,20 +162,6 @@ name_lost_cb (GDBusConnection *connection,
DEBUG ("Lost (or failed to acquire) the name %s on the session message bus\n", name);
}
-static void
-nautilus_freedesktop_dbus_constructed (GObject *object)
-{
- NautilusFreedesktopDBus *fdb = NAUTILUS_FREEDESKTOP_DBUS (object);
-
- fdb->owner_id = g_bus_own_name_on_connection (fdb->connection,
- NAUTILUS_FDO_DBUS_NAME,
- G_BUS_NAME_OWNER_FLAGS_NONE,
- name_acquired_cb,
- name_lost_cb,
- fdb,
- NULL);
-}
-
static void
nautilus_freedesktop_dbus_dispose (GObject *object)
{
@@ -252,7 +238,6 @@ nautilus_freedesktop_dbus_class_init (NautilusFreedesktopDBusClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = nautilus_freedesktop_dbus_dispose;
- object_class->constructed = nautilus_freedesktop_dbus_constructed;
object_class->get_property = nautilus_freedesktop_dbus_get_property;
object_class->set_property = nautilus_freedesktop_dbus_set_property;
@@ -301,7 +286,6 @@ nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDB
nautilus_freedesktop_file_manager1_set_open_locations (fdb->skeleton, locations);
}
-/* Tries to own the org.freedesktop.FileManager1 service name */
NautilusFreedesktopDBus *
nautilus_freedesktop_dbus_new (GDBusConnection *connection)
{
@@ -310,6 +294,7 @@ nautilus_freedesktop_dbus_new (GDBusConnection *connection)
NULL);
}
+/* Tries to own the org.freedesktop.FileManager1 service name */
gboolean
nautilus_freedesktop_dbus_register (NautilusFreedesktopDBus *fdb,
GError **error)
@@ -331,12 +316,26 @@ nautilus_freedesktop_dbus_register (NautilusFreedesktopDBus *fdb,
G_CALLBACK (skeleton_handle_show_item_properties_cb), fdb);
}
+ fdb->owner_id = g_bus_own_name_on_connection (fdb->connection,
+ NAUTILUS_FDO_DBUS_NAME,
+ G_BUS_NAME_OWNER_FLAGS_NONE,
+ name_acquired_cb,
+ name_lost_cb,
+ fdb,
+ NULL);
+
return success;
}
void
nautilus_freedesktop_dbus_unregister (NautilusFreedesktopDBus *fdb)
{
+ if (fdb->owner_id != 0)
+ {
+ g_bus_unown_name (fdb->owner_id);
+ fdb->owner_id = 0;
+ }
+
g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (fdb->skeleton));
g_signal_handlers_disconnect_by_data (fdb->skeleton, fdb);
--
2.39.1

View File

@ -1,29 +0,0 @@
From 4190844d91f9d4f1bb2997d7769caa57dd5f9a4c Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano1618@gmail.com>
Date: Fri, 7 Sep 2018 08:05:18 +0000
Subject: [PATCH] man: Remove geometry option
We removed that some time ago.
---
docs/nautilus.1 | 5 -----
1 file changed, 5 deletions(-)
diff --git a/docs/nautilus.1 b/docs/nautilus.1
index 70304a1d2..a868c72cb 100644
--- a/docs/nautilus.1
+++ b/docs/nautilus.1
@@ -37,11 +37,6 @@ Perform a quick set of self-check tests.
.B \-\-version
Show the version of the program.
-.TP
-.BR \-g ", " \-\-geometry=\fIGEOMETRY\fR
-Create the initial window with the given geometry. \fBDeprecated\fR - the geometry
-is saved and loaded using GSettings.
-
.TP
.BR \-w ", " \-\-new-window
Always open a new window for browsing specified URIs.
--
2.21.0

View File

@ -1,189 +0,0 @@
From a7a31137aee8c4af81d7d447ceb83ccdb2ddadc0 Mon Sep 17 00:00:00 2001
From: Xiang Fan <sfanxiang@gmail.com>
Date: Fri, 13 Jul 2018 11:49:09 -0700
Subject: [PATCH] nautilus-canvas-container: Remove the "include visible area"
logic.
canvas_set_scroll_region_include_visible_area() was added in
ec054c80981e26b71c8bb2e6853b035dc2063e7d to fix
https://bugzilla.gnome.org/show_bug.cgi?id=42068 ("Dragging icons
adjusts scroll area in a way that causes immediate scrolling"). This is
no longer the case, because now icons remain in place when being dragged
and are not allowed to be rearranged.
ec054c80981e26b71c8bb2e6853b035dc2063e7d causes issues relating to extra
scrolling space (#340), hence the removal.
Fixes #340.
---
src/nautilus-canvas-container.c | 79 +--------------------------------
src/nautilus-canvas-container.h | 1 -
src/nautilus-canvas-private.h | 3 --
src/nautilus-canvas-view.c | 6 ---
4 files changed, 1 insertion(+), 88 deletions(-)
diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
index 09acd47fc..bd05a3a2d 100644
--- a/src/nautilus-canvas-container.c
+++ b/src/nautilus-canvas-container.c
@@ -968,45 +968,6 @@ get_all_icon_bounds (NautilusCanvasContainer *container,
x1, y1, x2, y2, usage);
}
-/* Don't preserve visible white space the next time the scroll region
- * is recomputed when the container is not empty. */
-void
-nautilus_canvas_container_reset_scroll_region (NautilusCanvasContainer *container)
-{
- container->details->reset_scroll_region_trigger = TRUE;
-}
-
-/* Set a new scroll region without eliminating any of the currently-visible area. */
-static void
-canvas_set_scroll_region_include_visible_area (EelCanvas *canvas,
- double x1,
- double y1,
- double x2,
- double y2)
-{
- double old_x1, old_y1, old_x2, old_y2;
- double old_scroll_x, old_scroll_y;
- double height, width;
- GtkAllocation allocation;
-
- eel_canvas_get_scroll_region (canvas, &old_x1, &old_y1, &old_x2, &old_y2);
- gtk_widget_get_allocation (GTK_WIDGET (canvas), &allocation);
-
- width = (allocation.width) / canvas->pixels_per_unit;
- height = (allocation.height) / canvas->pixels_per_unit;
-
- old_scroll_x = gtk_adjustment_get_value (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (canvas)));
- old_scroll_y = gtk_adjustment_get_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (canvas)));
-
- x1 = MIN (x1, old_x1 + old_scroll_x);
- y1 = MIN (y1, old_y1 + old_scroll_y);
- x2 = MAX (x2, old_x1 + old_scroll_x + width);
- y2 = MAX (y2, old_y1 + old_scroll_y + height);
-
- eel_canvas_set_scroll_region
- (canvas, x1, y1, x2, y2);
-}
-
void
nautilus_canvas_container_update_scroll_region (NautilusCanvasContainer *container)
{
@@ -1014,24 +975,10 @@ nautilus_canvas_container_update_scroll_region (NautilusCanvasContainer *contain
double pixels_per_unit;
GtkAdjustment *hadj, *vadj;
float step_increment;
- gboolean reset_scroll_region;
GtkAllocation allocation;
pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
- reset_scroll_region = container->details->reset_scroll_region_trigger
- || nautilus_canvas_container_is_empty (container);
-
- /* The trigger is only cleared when container is non-empty, so
- * callers can reliably reset the scroll region when an item
- * is added even if extraneous relayouts are called when the
- * window is still empty.
- */
- if (!nautilus_canvas_container_is_empty (container))
- {
- container->details->reset_scroll_region_trigger = FALSE;
- }
-
get_all_icon_bounds (container, &x1, &y1, &x2, &y2, BOUNDS_USAGE_FOR_ENTIRE_ITEM);
/* Add border at the "end"of the layout (i.e. after the icons), to
@@ -1053,18 +1000,7 @@ nautilus_canvas_container_update_scroll_region (NautilusCanvasContainer *contain
y2 -= 1;
y2 = MAX (y1, y2);
- if (reset_scroll_region)
- {
- eel_canvas_set_scroll_region
- (EEL_CANVAS (container),
- x1, y1, x2, y2);
- }
- else
- {
- canvas_set_scroll_region_include_visible_area
- (EEL_CANVAS (container),
- x1, y1, x2, y2);
- }
+ eel_canvas_set_scroll_region (EEL_CANVAS (container), x1, y1, x2, y2);
hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container));
vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container));
@@ -5722,23 +5658,10 @@ nautilus_canvas_container_get_icon_drop_target_uri (NautilusCanvasContainer *con
return uri;
}
-/* Call to reset the scroll region only if the container is not empty,
- * to avoid having the flag linger until the next file is added.
- */
-static void
-reset_scroll_region_if_not_empty (NautilusCanvasContainer *container)
-{
- if (!nautilus_canvas_container_is_empty (container))
- {
- nautilus_canvas_container_reset_scroll_region (container);
- }
-}
-
/* Re-sort, switching to automatic layout if it was in manual layout. */
void
nautilus_canvas_container_sort (NautilusCanvasContainer *container)
{
- reset_scroll_region_if_not_empty (container);
container->details->needs_resort = TRUE;
redo_layout (container);
}
diff --git a/src/nautilus-canvas-container.h b/src/nautilus-canvas-container.h
index a370bba26..33929375d 100644
--- a/src/nautilus-canvas-container.h
+++ b/src/nautilus-canvas-container.h
@@ -271,7 +271,6 @@ void nautilus_canvas_container_set_single_click_mode (Nauti
gboolean single_click_mode);
void nautilus_canvas_container_enable_linger_selection (NautilusCanvasContainer *view,
gboolean enable);
-void nautilus_canvas_container_reset_scroll_region (NautilusCanvasContainer *container);
void nautilus_canvas_container_set_font (NautilusCanvasContainer *container,
const char *font);
void nautilus_canvas_container_set_margins (NautilusCanvasContainer *container,
diff --git a/src/nautilus-canvas-private.h b/src/nautilus-canvas-private.h
index dd5e79060..e60e86299 100644
--- a/src/nautilus-canvas-private.h
+++ b/src/nautilus-canvas-private.h
@@ -192,9 +192,6 @@ struct NautilusCanvasContainerDetails {
int size_allocation_count;
guint size_allocation_count_id;
-
- /* Ignore the visible area the next time the scroll region is recomputed */
- gboolean reset_scroll_region_trigger;
/* a11y items used by canvas items */
guint a11y_item_action_idle_handler;
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index f74ea06db..bd3a7ae5d 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -355,12 +355,6 @@ nautilus_canvas_view_add_files (NautilusFilesView *view,
canvas_view = NAUTILUS_CANVAS_VIEW (view);
canvas_container = get_canvas_container (canvas_view);
- /* Reset scroll region for the first canvas added when loading a directory. */
- if (nautilus_files_view_get_loading (view) && nautilus_canvas_container_is_empty (canvas_container))
- {
- nautilus_canvas_container_reset_scroll_region (canvas_container);
- }
-
for (l = files; l != NULL; l = l->next)
{
if (nautilus_canvas_container_add (canvas_container,
--
2.37.1

View File

@ -1,33 +0,0 @@
From 49718175b75c8ff89a219954f0abd6067e4a39f6 Mon Sep 17 00:00:00 2001
From: Wong Heung Sang <hswongac@gmail.com>
Date: Mon, 7 May 2018 00:10:15 +0800
Subject: [PATCH] nautilus-file.c: Fix open writable file in recent tab
File opened in recent tab now is read-only
when it is writable.
Replace nautilus_file_info_get_uri ()
with nautilus_file_info_get_activation_uri ()
fix the problem.
https://gitlab.gnome.org/GNOME/nautilus/issues/378
---
src/nautilus-file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 0ec5e3848..d3ba8c841 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -4482,7 +4482,7 @@ nautilus_file_get_activation_uri (NautilusFile *file)
{
g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
- return nautilus_file_info_get_uri (NAUTILUS_FILE_INFO (file));
+ return nautilus_file_info_get_activation_uri (NAUTILUS_FILE_INFO (file));
}
GFile *
--
2.29.2

View File

@ -1,40 +0,0 @@
From 3c78251bc3bda455423807cb7fd5e25e7f8afd7e Mon Sep 17 00:00:00 2001
From: Timothy OBrien <obrien.timothy.a@gmail.com>
Date: Sun, 27 Jan 2019 12:45:28 +1100
Subject: [PATCH] nautilus-mime-actions.c: No Application Installed dialog not
closed on GTK_RESPONSE_YES
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The "There is no application installed for “foo” files. Do you want to search for an application to open this file?" dialog that appears when there is no application installed to open the specific file type is not closed after clicking Yes. Instead, it reopens again.
This patch removes code that was causing the file to be activated after the user clicked Yes; relaunching the dialog.
Resolves #842
---
src/nautilus-mime-actions.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 6f0ad9db5..5d1d5234e 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -1191,14 +1191,6 @@ search_for_application_dbus_call_notify_cb (GDBusProxy *proxy,
g_variant_unref (variant);
- /* activate the file again */
- nautilus_mime_activate_files (parameters_install->parent_window,
- parameters_install->slot,
- parameters_install->files,
- parameters_install->activation_directory,
- parameters_install->flags,
- parameters_install->user_confirmation);
-
activate_parameters_install_free (parameters_install);
}
--
2.26.0

View File

@ -1,54 +0,0 @@
From 2eed21b2dd3ec0cdd701f9c18e1e2582c69bdad8 Mon Sep 17 00:00:00 2001
From: Timothy OBrien <obrien.timothy.a@gmail.com>
Date: Mon, 14 Jan 2019 02:17:42 +1100
Subject: [PATCH] org.gnome.Nautilus.appdata.xml.in.in: No screenshots in
appdata
No screenshots were supplied by the appdata xml meaning that software install tools would not show them to the user.
This commit proposes a set of screenshots hosted via the static-web project: https://gitlab.gnome.org/Infrastructure/static-web
See static-web merge request https://gitlab.gnome.org/Infrastructure/static-web/merge_requests/2 for proposed screenshots.
Fixes #556
---
data/org.gnome.Nautilus.appdata.xml.in.in | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/data/org.gnome.Nautilus.appdata.xml.in.in b/data/org.gnome.Nautilus.appdata.xml.in.in
index 30648b3e6..cb20fa05f 100644
--- a/data/org.gnome.Nautilus.appdata.xml.in.in
+++ b/data/org.gnome.Nautilus.appdata.xml.in.in
@@ -25,6 +25,24 @@
<kudo>Notifications</kudo>
<kudo>SearchProvider</kudo>
</kudos>
+ <screenshots>
+ <screenshot type="default">
+ <image>https://static.gnome.org/appdata/nautilus/nautilus-201901141.png</image>
+ <caption>Tile view</caption>
+ </screenshot>
+ <screenshot>
+ <image>https://static.gnome.org/appdata/nautilus/nautilus-201901142.png</image>
+ <caption>List view</caption>
+ </screenshot>
+ <screenshot>
+ <image>https://static.gnome.org/appdata/nautilus/nautilus-201901143.png</image>
+ <caption>Search</caption>
+ </screenshot>
+ <screenshot>
+ <image>https://static.gnome.org/appdata/nautilus/nautilus-201901144.png</image>
+ <caption>Other locations</caption>
+ </screenshot>
+ </screenshots>
<categories>
<category>System</category>
</categories>
@@ -35,3 +53,4 @@
<url type="help">https://wiki.gnome.org/action/show/Apps/Nautilus</url>
<translation type="gettext">nautilus</translation>
</component>
+
--
2.21.0

View File

@ -1,16 +0,0 @@
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 630b8ed33..2fe88fe1d 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -2033,7 +2033,7 @@ button_data_file_changed (NautilusFile *file,
if (g_file_has_prefix (current_location, location) ||
g_file_equal (current_location, location))
{
- nautilus_path_bar_clear_buttons (self);
+ /* Do nothing here, the view will set new path if needed. */
}
else if (g_file_has_prefix (location, current_location))
{
--
2.40.0

View File

@ -1,62 +0,0 @@
From a20229f185b494a107634c4b99b2be1ce962a277 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 26 Sep 2019 11:06:45 +0200
Subject: [PATCH] properties-window: Fix crashes when cancelled
Nautilus crashes on the "timed_wait_free: assertion failed:
(g_hash_table_lookup (timed_wait_hash_table, wait) != NULL)" assertion
when the creating of the properties window is cancelled. This is because
the timed wait has been already removed. Let's don't remove the wait
when cancelled in order to prevent the crashes.
---
src/nautilus-properties-window.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 969e3ffea..0112aeb3c 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -148,6 +148,7 @@ typedef struct
NautilusPropertiesWindowCallback callback;
gpointer callback_data;
NautilusPropertiesWindow *window;
+ gboolean cancelled;
} StartupData;
/* drag and drop definitions */
@@ -5229,6 +5230,8 @@ get_existing_window (GList *file_list)
static void
properties_window_finish (StartupData *data)
{
+ gboolean cancel_timed_wait;
+
if (data->parent_widget != NULL)
{
g_signal_handlers_disconnect_by_data (data->parent_widget,
@@ -5240,14 +5243,21 @@ properties_window_finish (StartupData *data)
data);
}
- remove_pending (data, TRUE, (data->window == NULL), FALSE);
+ cancel_timed_wait = (data->window == NULL && !data->cancelled);
+ remove_pending (data, TRUE, cancel_timed_wait, FALSE);
+
startup_data_free (data);
}
static void
cancel_create_properties_window_callback (gpointer callback_data)
{
- properties_window_finish ((StartupData *) callback_data);
+ StartupData *data;
+
+ data = callback_data;
+ data->cancelled = TRUE;
+
+ properties_window_finish (data);
}
static void
--
2.23.0

View File

@ -1,33 +0,0 @@
From c4b567936ebbba8479f6641c89b3980f7963b765 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 26 Sep 2019 11:07:35 +0200
Subject: [PATCH] properties-window: Fix crashes when opened multiple times
Nautilus crashes with segmentation fault when closing the properties dialog
after it has been opened mutliple times for the same file. This can't be
reproduced over Nautilus as it uses modal dialogs, however, it can be simply
reproduced over the Desktop Icons extension. Let's check the pending_key
variable before used to be sure it is not NULL to fix this crashes.
---
src/nautilus-properties-window.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 0112aeb3c..f6b2f21a6 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -5297,7 +5297,10 @@ remove_pending (StartupData *startup_data,
eel_timed_wait_stop
(cancel_create_properties_window_callback, startup_data);
}
- g_hash_table_remove (pending_lists, startup_data->pending_key);
+ if (startup_data->pending_key != NULL)
+ {
+ g_hash_table_remove (pending_lists, startup_data->pending_key);
+ }
}
static gboolean
--
2.23.0

View File

@ -1,32 +0,0 @@
From 97ec09e79d0a92f57ef6bb6b7e042921f5c3c3c8 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Tue, 24 Sep 2019 17:06:15 +0200
Subject: [PATCH] properties-window: Fix criticals when closing
The "eel_timed_wait_stop: assertion 'wait != NULL' failed" critical
is printed when closing the properties window since commit c8c2fab2.
This is because the timed wait has been already removed. Let's remove
the wait when closing only if it has not been yet removed in order to
prevent this criticals.
Fixes: https://gitlab.gnome.org/GNOME/nautilus/issues/1075
---
src/nautilus-properties-window.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 9d9bd1c54..969e3ffea 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -5240,7 +5240,7 @@ properties_window_finish (StartupData *data)
data);
}
- remove_pending (data, TRUE, TRUE, FALSE);
+ remove_pending (data, TRUE, (data->window == NULL), FALSE);
startup_data_free (data);
}
--
2.23.0

View File

@ -1,46 +0,0 @@
From 13ecf5f9c2d219866550757cb660b569299ac285 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Mon, 2 Mar 2020 14:53:36 +0100
Subject: [PATCH] properties-window: Fix endless content size calculations
The total number of items and their size are shown in Properties dialog.
However, the deep count calculations are currently restarted with each
"changed" event of `NautilusFile` object(s). This is not usually a problem
if only one file is selected, but it is a pretty big issue when more
files are selected. It is common that the calculation never ends. This
is because the "changed" events are emitted in many irrelevant cases
(e.g. free space change) and it totally doesn't make sense to restart
the calculation in most of the cases. The initial idea was to react
on ongoing file operations, however, the calculation currently doesn't
react on file changes deeper in the tree anyway, or on changes, which
happened after the calculation is done. Thus the current result can be
outdated anyway.
Let's ignore `NautilusFile` changes at all when calculating the content
size as it is pretty impossible to implement this properly to dynamically
react on all size changes in the tree.
Fixes: https://gitlab.gnome.org/GNOME/nautilus/issues/363
---
src/nautilus-properties-window.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 9250adbe3..52a2b3fce 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -1137,10 +1137,6 @@ properties_window_update (NautilusPropertiesWindow *window,
{
dirty_target = TRUE;
}
- if (changed_file != NULL)
- {
- start_deep_count_for_file (window, changed_file);
- }
}
if (dirty_original)
--
2.26.0

View File

@ -1,900 +0,0 @@
From 93ecc7c079a438bb2baf34500fa77806a545910a Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Tue, 23 Apr 2019 11:35:45 +0200
Subject: [PATCH] Remove nfs support strings
---
src/gtk/nautilusgtkplacesview.ui | 701 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
1 file changed, 388 insertions(+), 313 deletions(-)
diff --git a/src/gtk/nautilusgtkplacesview.ui b/src/gtk/nautilusgtkplacesview.ui
index c366fde..601fce2 100644
--- a/src/gtk/nautilusgtkplacesview.ui
+++ b/src/gtk/nautilusgtkplacesview.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface domain="gtk30">
<requires lib="gtk+" version="3.16"/>
<object class="GtkListStore" id="completion_store">
@@ -11,265 +12,52 @@
</object>
<object class="GtkEntryCompletion" id="address_entry_completion">
<property name="model">completion_store</property>
- <property name="text-column">1</property>
- <property name="inline-completion">1</property>
- <property name="popup-completion">0</property>
- </object>
- <object class="GtkPopover" id="server_adresses_popover">
- <property name="relative-to">address_entry</property>
- <child>
- <object class="GtkBox">
- <property name="visible">1</property>
- <property name="border-width">18</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <property name="label" translatable="yes">Server Addresses</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <property name="label" translatable="yes">Server addresses are made up of a protocol prefix and an address. Examples:</property>
- <property name="wrap">1</property>
- <property name="width-chars">40</property>
- <property name="max-width-chars">40</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <property name="label">smb://gnome.org, ssh://192.168.0.1, ftp://[2001:db8::1]</property>
- <property name="wrap">1</property>
- <property name="width-chars">40</property>
- <property name="max-width-chars">40</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid">
- <property name="visible">1</property>
- <property name="margin-top">12</property>
- <property name="hexpand">1</property>
- <property name="row-spacing">6</property>
- <property name="column-spacing">12</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <property name="label" translatable="yes">Available Protocols</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">AppleTalk</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">File Transfer Protocol</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">Network File System</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">Samba</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">SSH File Transfer Protocol</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">WebDAV</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">Prefix</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label">afp://</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes" comments="Translators: do not translate ftp:// and ftps://">ftp:// or ftps://</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label">nfs://</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">smb://</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes" comments="Translators: do not translate sftp:// and ssh://">sftp:// or ssh://</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes" comments="Translators: do not translate dav:// and davs://">dav:// or davs://</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">6</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="text_column">1</property>
+ <property name="inline_completion">True</property>
+ <property name="popup_completion">False</property>
</object>
<object class="GtkPopover" id="recent_servers_popover">
+ <property name="can_focus">False</property>
<child>
<object class="GtkStack" id="recent_servers_stack">
- <property name="visible">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkBox">
- <property name="visible">1</property>
- <property name="vexpand">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkImage">
- <property name="visible">1</property>
- <property name="pixel-size">48</property>
- <property name="icon-name">network-server-symbolic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixel_size">48</property>
+ <property name="icon_name">network-server-symbolic</property>
<style>
<class name="dim-label"/>
</style>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel">
- <property name="visible">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Translators: Server as any successfully connected network address">No recent servers found</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -280,82 +68,98 @@
</child>
<child>
<object class="GtkBox">
- <property name="visible">1</property>
- <property name="border-width">12</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
- <property name="visible">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Recent Servers</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkScrolledWindow">
- <property name="visible">1</property>
- <property name="can-focus">1</property>
- <property name="vexpand">1</property>
- <property name="shadow-type">in</property>
- <property name="min-content-width">250</property>
- <property name="min-content-height">200</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="min_content_width">250</property>
+ <property name="min_content_height">200</property>
<child>
<object class="GtkViewport">
- <property name="visible">1</property>
- <property name="shadow-type">none</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkListBox" id="recent_servers_listbox">
- <property name="visible">1</property>
- <property name="can-focus">1</property>
- <property name="selection-mode">none</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="selection_mode">none</property>
<signal name="row-activated" handler="on_recent_servers_listbox_row_activated" object="NautilusGtkPlacesView" swapped="yes"/>
</object>
</child>
</object>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="name">list</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<template class="NautilusGtkPlacesView" parent="GtkBox">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<signal name="key-press-event" handler="on_key_press_event" object="NautilusGtkPlacesView" swapped="no"/>
<child>
<object class="GtkStack" id="stack">
- <property name="visible">1</property>
- <property name="vhomogeneous">0</property>
- <property name="transition-type">crossfade</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vhomogeneous">False</property>
+ <property name="transition_type">crossfade</property>
<child>
<object class="GtkFrame">
- <property name="visible">1</property>
- <property name="shadow-type">none</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkScrolledWindow">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <property name="vexpand">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkViewport">
- <property name="visible">1</property>
- <property name="shadow-type">none</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkListBox" id="listbox">
- <property name="visible">1</property>
- <property name="can-focus">1</property>
- <property name="selection-mode">none</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="selection_mode">none</property>
<signal name="row-activated" handler="on_listbox_row_activated" object="NautilusGtkPlacesView" swapped="yes"/>
</object>
</child>
@@ -370,51 +174,65 @@
</child>
<child>
<object class="GtkBox">
- <property name="visible">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="hexpand">1</property>
- <property name="vexpand">1</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage">
- <property name="visible">1</property>
- <property name="pixel-size">72</property>
- <property name="icon-name">edit-find-symbolic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixel_size">72</property>
+ <property name="icon_name">edit-find-symbolic</property>
<style>
<class name="dim-label"/>
</style>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel">
- <property name="visible">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">No results found</property>
<attributes>
<attribute name="weight" value="bold"/>
- <attribute name="scale" value="1.44"/>
+ <attribute name="scale" value="1.4399999999999999"/>
</attributes>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel">
- <property name="visible">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Try a different search</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="name">empty-search</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -426,89 +244,346 @@
</child>
<child>
<object class="GtkActionBar" id="actionbar">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <style>
- <class name="background"/>
- </style>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkLabel">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <property name="xalign">0</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label" translatable="yes">Connect to _Server</property>
- <property name="mnemonic-widget">address_entry</property>
- <property name="use-underline">1</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">address_entry</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
- </child>
- <child>
- <object class="GtkButton" id="connect_button">
- <property name="label" translatable="yes">Con_nect</property>
- <property name="use-underline">1</property>
- <property name="visible">1</property>
- <property name="can-focus">1</property>
- <property name="sensitive">0</property>
- <property name="receives-default">1</property>
- <property name="valign">center</property>
- <signal name="clicked" handler="on_connect_button_clicked" object="NautilusGtkPlacesView" swapped="yes"/>
- </object>
<packing>
- <property name="pack-type">end</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkEntry" id="address_entry">
- <property name="visible">1</property>
- <property name="can-focus">1</property>
- <property name="hexpand">1</property>
- <property name="width-chars">20</property>
- <property name="placeholder-text" translatable="yes">Enter server address…</property>
- <property name="secondary-icon-name">dialog-question-symbolic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="width_chars">20</property>
+ <property name="secondary_icon_name">dialog-question-symbolic</property>
+ <property name="placeholder_text" translatable="yes">Enter server address…</property>
<property name="completion">address_entry_completion</property>
- <signal name="notify::text" handler="on_address_entry_text_changed" object="NautilusGtkPlacesView" swapped="yes"/>
<signal name="activate" handler="on_connect_button_clicked" object="NautilusGtkPlacesView" swapped="yes"/>
<signal name="icon-press" handler="on_address_entry_show_help_pressed" object="NautilusGtkPlacesView" swapped="yes"/>
+ <signal name="notify::text" handler="on_address_entry_text_changed" object="NautilusGtkPlacesView" swapped="yes"/>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkMenuButton" id="server_list_button">
- <property name="visible">1</property>
- <property name="can-focus">1</property>
- <property name="receives-default">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="direction">up</property>
<property name="popover">recent_servers_popover</property>
- <style>
- <class name="server-list-button"/>
- </style>
<child>
<object class="GtkImage">
- <property name="visible">1</property>
- <property name="icon-name">pan-down-symbolic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">pan-down-symbolic</property>
</object>
</child>
+ <style>
+ <class name="server-list-button"/>
+ </style>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
<style>
<class name="linked"/>
</style>
</object>
<packing>
- <property name="pack-type">end</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="connect_button">
+ <property name="label" translatable="yes">Con_nect</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">center</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_connect_button_clicked" object="NautilusGtkPlacesView" swapped="yes"/>
+ </object>
+ <packing>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
+ <style>
+ <class name="background"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</template>
+ <object class="GtkPopover" id="server_adresses_popover">
+ <property name="can_focus">False</property>
+ <property name="relative_to">address_entry</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">18</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Server Addresses</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Server addresses are made up of a protocol prefix and an address. Examples:</property>
+ <property name="wrap">True</property>
+ <property name="width_chars">40</property>
+ <property name="max_width_chars">40</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label">smb://gnome.org, ssh://192.168.0.1, ftp://[2001:db8::1]</property>
+ <property name="wrap">True</property>
+ <property name="width_chars">40</property>
+ <property name="max_width_chars">40</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">12</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Available Protocols</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">AppleTalk</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">File Transfer Protocol</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Samba</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">SSH File Transfer Protocol</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">WebDAV</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Prefix</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">afp://</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="Translators: do not translate ftp:// and ftps://">ftp:// or ftps://</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">smb://</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="Translators: do not translate sftp:// and ssh://">sftp:// or ssh://</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="Translators: do not translate dav:// and davs://">dav:// or davs://</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
</interface>
--
libgit2 0.26.0

View File

@ -1,90 +0,0 @@
diff --git a/src/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c
index 66494cae8..32b6039a9 100644
--- a/src/nautilus-search-engine-tracker.c
+++ b/src/nautilus-search-engine-tracker.c
@@ -286,6 +286,12 @@ search_finished_idle (gpointer user_data)
return FALSE;
}
+/* This is used to compensate rank if fts:rank is not set (resp. fts:match is
+ * not used). The value was determined experimentally. I am conviced that
+ * fts:rank is currently always set to 5.0 in case of filename match.
+ */
+#define FILENAME_RANK 5.0
+
static void
nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
{
@@ -327,7 +333,11 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
mimetypes = nautilus_query_get_mime_types (tracker->query);
mime_count = g_list_length (mimetypes);
- sparql = g_string_new ("SELECT DISTINCT nie:url(?urn) fts:rank(?urn) nfo:fileLastModified(?urn) nfo:fileLastAccessed(?urn)");
+ sparql = g_string_new ("SELECT DISTINCT"
+ " nie:url(?urn)"
+ " xsd:double(COALESCE(?rank2, ?rank1)) AS ?rank"
+ " nfo:fileLastModified(?urn)"
+ " nfo:fileLastAccessed(?urn)");
if (tracker->fts_enabled)
{
@@ -342,16 +352,31 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
" tracker:available true;"
" nie:url ?url");
- if (*search_text)
+ if (mime_count > 0)
{
- g_string_append_printf (sparql, "; fts:match '\"%s\"*'", search_text);
+ g_string_append (sparql, "; nie:mimeType ?mime");
}
- if (mime_count > 0)
+ if (tracker->fts_enabled)
{
- g_string_append (sparql, "; nie:mimeType ?mime");
+ /* Use fts:match only for content search to not lose some filename results due to stop words. */
+ g_string_append_printf (sparql,
+ " {"
+ " ?urn fts:match '\"nie:plainTextContent\" : \"%s\"*' ."
+ " BIND(fts:rank(?urn) AS ?rank1) ."
+ " } UNION",
+ search_text);
}
+ g_string_append_printf (sparql,
+ " {"
+ " ?urn nfo:fileName ?filename ."
+ " FILTER(fn:contains(fn:lower-case(?filename), '%s')) ."
+ " BIND(%f AS ?rank2) ."
+ " }",
+ search_text,
+ FILENAME_RANK);
+
g_string_append_printf (sparql, " . FILTER( ");
if (!tracker->recursive)
@@ -363,11 +388,6 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
g_string_append_printf (sparql, "tracker:uri-is-descendant('%s', ?url)", location_uri);
}
- if (!tracker->fts_enabled)
- {
- g_string_append_printf (sparql, " && fn:contains(fn:lower-case(nfo:fileName(?urn)), '%s')", search_text);
- }
-
date_range = nautilus_query_get_date_range (tracker->query);
if (date_range)
{
@@ -424,7 +444,7 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
g_string_append (sparql, ")\n");
}
- g_string_append (sparql, ")} ORDER BY DESC (fts:rank(?urn))");
+ g_string_append (sparql, ")} ORDER BY DESC (?rank)");
tracker->cancellable = g_cancellable_new ();
tracker_sparql_connection_query_async (tracker->connection,
--
2.23.0

View File

@ -1,33 +0,0 @@
From 33fafad8430ac32a750fd3315d507482c8028c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
Date: Fri, 29 May 2020 13:16:11 +0100
Subject: [PATCH] search-engine-tracker: Expand macro as string
We have changed the FILENAME_RANK constant from being used as a format
string argument to be concatenated as a string during compilation, as
detailed in 7f00ede9b410e88106cef34c634cb46e46015e37
However, I have forgotten to quote the constant, which otherwise cannot
be treated as a string to concatenate.
Fix that now.
---
src/nautilus-search-engine-tracker.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c
index 571467a25..13470a62e 100644
--- a/src/nautilus-search-engine-tracker.c
+++ b/src/nautilus-search-engine-tracker.c
@@ -290,7 +290,7 @@ search_finished_idle (gpointer user_data)
* not used). The value was determined experimentally. I am convinced that
* fts:rank is currently always set to 5.0 in case of filename match.
*/
-#define FILENAME_RANK 5.0
+#define FILENAME_RANK "5.0"
static void
nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
--
2.26.2

View File

@ -1,53 +0,0 @@
From 7018cdcaa9954271cd82ba1c2620ecdfea176fae Mon Sep 17 00:00:00 2001
From: Cristiano Nunes <cfgnunes@gmail.com>
Date: Tue, 7 Apr 2020 14:47:41 +0000
Subject: [PATCH] search-engine-tracker: Fix broken query under some locales
We set a 5.0 rank for filename matches in the SPARQL query as a float
argument in a format string.
However, the floats in format strings are translated with the decimal
separator from the locale. This means in some locales the rank has a
comma instead of a dot, which results in a query error. In turn, this
effectively broke the shell search provider.
Instead of using a format specifier and passing the value as an
argument, we should just use compile-time concatenation to insert '5.0'
in the query unmodified.
Fixes https://gitlab.gnome.org/GNOME/nautilus/-/issues/1412 and #1437
Cherry-picked from 7f00ede9b410e88106cef34c634cb46e46015e37
---
src/nautilus-search-engine-tracker.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c
index 32b6039a9..571467a25 100644
--- a/src/nautilus-search-engine-tracker.c
+++ b/src/nautilus-search-engine-tracker.c
@@ -287,7 +287,7 @@ search_finished_idle (gpointer user_data)
}
/* This is used to compensate rank if fts:rank is not set (resp. fts:match is
- * not used). The value was determined experimentally. I am conviced that
+ * not used). The value was determined experimentally. I am convinced that
* fts:rank is currently always set to 5.0 in case of filename match.
*/
#define FILENAME_RANK 5.0
@@ -372,10 +372,9 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
" {"
" ?urn nfo:fileName ?filename ."
" FILTER(fn:contains(fn:lower-case(?filename), '%s')) ."
- " BIND(%f AS ?rank2) ."
+ " BIND(" FILENAME_RANK " AS ?rank2) ."
" }",
- search_text,
- FILENAME_RANK);
+ search_text);
g_string_append_printf (sparql, " . FILTER( ");
--
2.26.2

View File

@ -1,13 +0,0 @@
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 89d492a76..5ea21b1d8 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -2864,6 +2864,7 @@ nautilus_window_show_about_dialog (NautilusWindow *window)
"program-name", program_name,
"version", VERSION,
"comments", _("Access and organize your files."),
+ "website", "https://wiki.gnome.org/action/show/Apps/Files",
"copyright", "Copyright © 19992018 The Files Authors",
"license-type", GTK_LICENSE_GPL_3_0,
"artists", artists,

View File

@ -1,35 +0,0 @@
From 668e0673a7ea3fe4cb6c99bc7b56bc52597e2061 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Wed, 25 Sep 2019 09:16:44 +0200
Subject: [PATCH] window: Fix criticals when moving file to trash
The "gtk_revealer_get_transition_type: assertion 'GTK_IS_REVEALER (revealer)'
failed" critical is printed when moving file to trash after closing a window.
This is because the "undo-changed" signal handler is not disconnected when
the window is destroyed. Let's use g_signal_connect_object() to ensure
disconnection and prevent those criticals.
Fixes: https://gitlab.gnome.org/GNOME/nautilus/issues/1076
---
src/nautilus-window.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 285a6a6ce..056c75c7a 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -2239,8 +2239,9 @@ nautilus_window_constructed (GObject *self)
nautilus_window_set_up_sidebar (window);
- g_signal_connect_after (nautilus_file_undo_manager_get (), "undo-changed",
- G_CALLBACK (nautilus_window_on_undo_changed), self);
+ g_signal_connect_object (nautilus_file_undo_manager_get (), "undo-changed",
+ G_CALLBACK (nautilus_window_on_undo_changed), self,
+ G_CONNECT_AFTER);
/* Is required that the UI is constructed before initializating the actions, since
* some actions trigger UI widgets to show/hide. */
--
2.23.0

View File

@ -1,118 +0,0 @@
From 4bdd3fad8d51e50e3539c8e04bc91538467bd236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
Date: Wed, 8 Jul 2020 14:44:38 +0100
Subject: [PATCH] window: Streamline RestoreTabData memory management
When restoring the back and forward lists, we make a deep copy only to
free the data immediately afterwards.
Instead of reallocating the lists unnecessarily, let's just steal them.
Also, use g_queue_free_full() to make free_restore_tab_data() a proper
GDestroyNotify; also define it in window-slot.c, where it belongs.
---
src/nautilus-window-slot.c | 16 ++++++++++++++--
src/nautilus-window-slot.h | 1 +
src/nautilus-window.c | 20 ++------------------
3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index c3260aeb0..bf040bff2 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -155,6 +155,18 @@ static void trash_state_changed_cb (NautilusTrashMonitor *monitor,
gboolean is_empty,
gpointer user_data);
+void
+free_restore_tab_data (gpointer data)
+{
+ RestoreTabData *tab_data = data;
+
+ g_list_free_full (tab_data->back_list, g_object_unref);
+ g_list_free_full (tab_data->forward_list, g_object_unref);
+ nautilus_file_unref (tab_data->file);
+
+ g_free (tab_data);
+}
+
void
nautilus_window_slot_restore_from_data (NautilusWindowSlot *self,
RestoreTabData *data)
@@ -163,9 +175,9 @@ nautilus_window_slot_restore_from_data (NautilusWindowSlot *self,
priv = nautilus_window_slot_get_instance_private (self);
- priv->back_list = g_list_copy_deep (data->back_list, (GCopyFunc) g_object_ref, NULL);
+ priv->back_list = g_steal_pointer (&data->back_list);
- priv->forward_list = g_list_copy_deep (data->forward_list, (GCopyFunc) g_object_ref, NULL);
+ priv->forward_list = g_steal_pointer (&data->forward_list);
priv->view_mode_before_search = data->view_before_search;
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index 573357d9b..bda1a920f 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -125,4 +125,5 @@ RestoreTabData* nautilus_window_slot_get_restore_tab_data (NautilusWindowSlot *s
/* Only used by slot-dnd */
NautilusView* nautilus_window_slot_get_current_view (NautilusWindowSlot *slot);
+void free_restore_tab_data (gpointer data);
#endif /* NAUTILUS_WINDOW_SLOT_H */
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 1f8d5208e..175da6fce 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -79,8 +79,6 @@ static GtkWidget *nautilus_window_ensure_location_entry (NautilusWindow *window)
static void close_slot (NautilusWindow *window,
NautilusWindowSlot *slot,
gboolean remove_from_notebook);
-static void free_restore_tab_data (gpointer data,
- gpointer user_data);
/* Sanity check: highest mouse button value I could find was 14. 5 is our
* lower threshold (well-documented to be the one of the button events for the
@@ -1374,7 +1372,7 @@ action_restore_tab (GSimpleAction *action,
nautilus_window_slot_open_location_full (slot, location, flags, NULL);
nautilus_window_slot_restore_from_data (slot, data);
- free_restore_tab_data (data, NULL);
+ free_restore_tab_data (data);
}
static void
@@ -2501,19 +2499,6 @@ nautilus_window_destroy (GtkWidget *object)
GTK_WIDGET_CLASS (nautilus_window_parent_class)->destroy (object);
}
-static void
-free_restore_tab_data (gpointer data,
- gpointer user_data)
-{
- RestoreTabData *tab_data = data;
-
- g_list_free_full (tab_data->back_list, g_object_unref);
- g_list_free_full (tab_data->forward_list, g_object_unref);
- nautilus_file_unref (tab_data->file);
-
- g_free (tab_data);
-}
-
static void
nautilus_window_finalize (GObject *object)
{
@@ -2548,8 +2533,7 @@ nautilus_window_finalize (GObject *object)
G_CALLBACK (nautilus_window_on_undo_changed),
window);
- g_queue_foreach (priv->tab_data_queue, (GFunc) free_restore_tab_data, NULL);
- g_queue_free (priv->tab_data_queue);
+ g_queue_free_full (priv->tab_data_queue, free_restore_tab_data);
g_object_unref (priv->pad_controller);
--
2.35.1

View File

@ -1,37 +0,0 @@
From 87d2f2cfd61baf813aee204be570172b78159281 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Wed, 14 Jun 2023 12:52:02 +0200
Subject: [PATCH] window-slot: Fix conditions to restore selection when
reloading
Currently, the `nautilus_window_slot_force_reload` function doesn't
preserve selection or position. However, there is a code that should do
it. The code is executed only when `new_content_view != NULL`, but it
is based on the `content_view` property. This seems to be a regression
caused by the commit 9806d70e. Let's fix that condition in order to
ensure that the selection and position are restored.
---
src/nautilus-window-slot.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 2bfb3f3ce..8ceac9562 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -2376,11 +2376,11 @@ nautilus_window_slot_force_reload (NautilusWindowSlot *self)
g_object_ref (location);
current_pos = NULL;
- if (priv->new_content_view)
+ if (priv->content_view)
{
selection = nautilus_view_get_selection (priv->content_view);
- if (NAUTILUS_IS_FILES_VIEW (priv->new_content_view))
+ if (NAUTILUS_IS_FILES_VIEW (priv->content_view))
{
current_pos = nautilus_files_view_get_first_visible_file (NAUTILUS_FILES_VIEW (priv->content_view));
}
--
2.40.0

View File

@ -1,43 +0,0 @@
From f68481d2d8393f1ba1a9b0a86a1b28b6ac303a63 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Wed, 24 May 2023 13:09:35 +0200
Subject: [PATCH] window-slot: Force reload current location when it reappears
When the currently opened location disappears, nautilus tries to
reopen it thanks to the commit b0e28bc1. However, the
`nautilus_window_slot_open_location_full` function doesn't begin the
location change when the old location is the same as the new one. This
is a problem because the old `NautilusFile` object is marked as gone
and thus monitoring and perhaps some other stuff won't work. Let's use
the `nautilus_window_slot_force_reload` function instead, in this case,
to ensure that the underlying `NautilusFile` is updated.
---
src/nautilus-window-slot.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 811152a21..561b34f12 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -1458,7 +1458,17 @@ viewed_file_changed_callback (NautilusFile *file,
go_to_file = g_file_new_for_path (g_get_home_dir ());
}
- nautilus_window_slot_open_location_full (self, go_to_file, 0, NULL);
+ if (g_file_equal (location, go_to_file))
+ {
+ /* Path gone by time out may have been remounted by
+ * `nautilus_find_existing_uri_in_hierarchy()`.
+ */
+ nautilus_window_slot_force_reload (self);
+ }
+ else
+ {
+ nautilus_window_slot_open_location_full (self, go_to_file, 0, NULL);
+ }
g_object_unref (go_to_file);
g_object_unref (location);
--
2.40.0

View File

@ -1,170 +0,0 @@
From 148559bc6809aac40be4aff64b7d3a4e5ac3c59a Mon Sep 17 00:00:00 2001
From: Sachin Daluja <30343-sachindaluja@users.noreply.gitlab.gnome.org>
Date: Sun, 24 May 2020 13:29:49 -0400
Subject: [PATCH] window-slot: Rename RestoreTabData to NautilusNavigationState
This struct is going to be used to also restore navigation state when
replacing the active window slot in order to handle other-locations://
Also enhance it to also save and restore the current location bookmark.
---
src/nautilus-window-slot.c | 28 ++++++++++++++++------------
src/nautilus-window-slot.h | 11 ++++++-----
src/nautilus-window.c | 12 ++++++------
3 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index bf040bff2..e688f0716 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -156,20 +156,21 @@ static void trash_state_changed_cb (NautilusTrashMonitor *monitor,
gpointer user_data);
void
-free_restore_tab_data (gpointer data)
+free_navigation_state (gpointer data)
{
- RestoreTabData *tab_data = data;
+ NautilusNavigationState *navigation_state = data;
- g_list_free_full (tab_data->back_list, g_object_unref);
- g_list_free_full (tab_data->forward_list, g_object_unref);
- nautilus_file_unref (tab_data->file);
+ g_list_free_full (navigation_state->back_list, g_object_unref);
+ g_list_free_full (navigation_state->forward_list, g_object_unref);
+ nautilus_file_unref (navigation_state->file);
+ g_clear_object (&navigation_state->current_location_bookmark);
- g_free (tab_data);
+ g_free (navigation_state);
}
void
-nautilus_window_slot_restore_from_data (NautilusWindowSlot *self,
- RestoreTabData *data)
+nautilus_window_slot_restore_navigation_state (NautilusWindowSlot *self,
+ NautilusNavigationState *data)
{
NautilusWindowSlotPrivate *priv;
@@ -181,14 +182,16 @@ nautilus_window_slot_restore_from_data (NautilusWindowSlot *self,
priv->view_mode_before_search = data->view_before_search;
+ g_set_object (&priv->current_location_bookmark, data->current_location_bookmark);
+
priv->location_change_type = NAUTILUS_LOCATION_CHANGE_RELOAD;
}
-RestoreTabData *
-nautilus_window_slot_get_restore_tab_data (NautilusWindowSlot *self)
+NautilusNavigationState *
+nautilus_window_slot_get_navigation_state (NautilusWindowSlot *self)
{
NautilusWindowSlotPrivate *priv;
- RestoreTabData *data;
+ NautilusNavigationState *data;
GList *back_list;
GList *forward_list;
@@ -211,11 +214,12 @@ nautilus_window_slot_get_restore_tab_data (NautilusWindowSlot *self)
* the view mode before search and a reference to the file.
* A GFile isn't enough, as the NautilusFile also keeps a
* reference to the search directory */
- data = g_new0 (RestoreTabData, 1);
+ data = g_new0 (NautilusNavigationState, 1);
data->back_list = back_list;
data->forward_list = forward_list;
data->file = nautilus_file_get (priv->location);
data->view_before_search = priv->view_mode_before_search;
+ g_set_object (&data->current_location_bookmark, priv->current_location_bookmark);
return data;
}
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index bda1a920f..2edc96786 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -48,7 +48,8 @@ typedef struct
gint view_before_search;
GList *back_list;
GList *forward_list;
-} RestoreTabData;
+ NautilusBookmark *current_location_bookmark;
+} NautilusNavigationState;
struct _NautilusWindowSlotClass {
GtkBoxClass parent_class;
@@ -117,13 +118,13 @@ void nautilus_window_slot_search (NautilusWindowSlot *
gboolean nautilus_window_slot_handles_location (NautilusWindowSlot *self,
GFile *location);
-void nautilus_window_slot_restore_from_data (NautilusWindowSlot *self,
- RestoreTabData *data);
+void nautilus_window_slot_restore_navigation_state (NautilusWindowSlot *self,
+ NautilusNavigationState *data);
-RestoreTabData* nautilus_window_slot_get_restore_tab_data (NautilusWindowSlot *self);
+NautilusNavigationState* nautilus_window_slot_get_navigation_state (NautilusWindowSlot *self);
/* Only used by slot-dnd */
NautilusView* nautilus_window_slot_get_current_view (NautilusWindowSlot *slot);
-void free_restore_tab_data (gpointer data);
+void free_navigation_state (gpointer data);
#endif /* NAUTILUS_WINDOW_SLOT_H */
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 175da6fce..900239cb8 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1349,7 +1349,7 @@ action_restore_tab (GSimpleAction *action,
NautilusWindowOpenFlags flags;
g_autoptr (GFile) location = NULL;
NautilusWindowSlot *slot;
- RestoreTabData *data;
+ NautilusNavigationState *data;
priv = nautilus_window_get_instance_private (window);
@@ -1370,9 +1370,9 @@ action_restore_tab (GSimpleAction *action,
slot = nautilus_window_create_and_init_slot (window, location, flags);
nautilus_window_slot_open_location_full (slot, location, flags, NULL);
- nautilus_window_slot_restore_from_data (slot, data);
+ nautilus_window_slot_restore_navigation_state (slot, data);
- free_restore_tab_data (data);
+ free_navigation_state (data);
}
static void
@@ -1579,7 +1579,7 @@ nautilus_window_slot_close (NautilusWindow *window,
{
NautilusWindowPrivate *priv;
NautilusWindowSlot *next_slot;
- RestoreTabData *data;
+ NautilusNavigationState *data;
DEBUG ("Requesting to remove slot %p from window %p", slot, window);
if (window == NULL)
@@ -1595,7 +1595,7 @@ nautilus_window_slot_close (NautilusWindow *window,
nautilus_window_set_active_slot (window, next_slot);
}
- data = nautilus_window_slot_get_restore_tab_data (slot);
+ data = nautilus_window_slot_get_navigation_state (slot);
if (data != NULL)
{
g_queue_push_head (priv->tab_data_queue, data);
@@ -2533,7 +2533,7 @@ nautilus_window_finalize (GObject *object)
G_CALLBACK (nautilus_window_on_undo_changed),
window);
- g_queue_free_full (priv->tab_data_queue, free_restore_tab_data);
+ g_queue_free_full (priv->tab_data_queue, free_navigation_state);
g_object_unref (priv->pad_controller);
--
2.35.1

View File

@ -1,72 +0,0 @@
From b0e28bc19c065b4bc1d6fdea922ae2c09115b0e6 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Tue, 24 Jan 2023 12:13:15 +0100
Subject: [PATCH] window-slot: Try current location even if it is marked as
gone
When the current location is marked as gone, Nautilus jumps to the
first existing parent currently (except for non-native locations and
mount roots). This is fine in most cases, but not for autofs locations
as Nautilus jumps to parent everytime autofs mount timeouted. It would
be better to stay in the same folder in this case. Let's try the current
location first even if it is marked as gone to ensure that. It would be
perhaps even better to prevent autofs locations somehow from timeouting
at all, or avoid immediate remounting at least, but those solutions
don't look easy to implement.
Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/1514
---
src/nautilus-window-slot.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index c06dc3432..a1af61887 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -1442,11 +1442,10 @@ viewed_file_changed_callback (NautilusFile *file,
if (priv->viewed_file_seen)
{
GFile *go_to_file;
- GFile *parent;
GFile *location;
GMount *mount;
+ gboolean find_existing = FALSE;
- parent = NULL;
location = nautilus_file_get_location (file);
if (g_file_is_native (location))
@@ -1455,16 +1454,18 @@ viewed_file_changed_callback (NautilusFile *file,
if (mount == NULL)
{
- parent = g_file_get_parent (location);
+ find_existing = TRUE;
}
g_clear_object (&mount);
}
- if (parent != NULL)
+ if (find_existing)
{
- /* auto-show existing parent */
- go_to_file = nautilus_find_existing_uri_in_hierarchy (parent);
+ /* Verify also the current location to prevent jumps to parent
+ * in case of autofs.
+ */
+ go_to_file = nautilus_find_existing_uri_in_hierarchy (location);
}
else
{
@@ -1473,7 +1474,6 @@ viewed_file_changed_callback (NautilusFile *file,
nautilus_window_slot_open_location_full (self, go_to_file, 0, NULL);
- g_clear_object (&parent);
g_object_unref (go_to_file);
g_object_unref (location);
}
--
2.39.2

View File

@ -1,242 +0,0 @@
From fe7533b0b82e2ebc7767006ee9768572700a91df Mon Sep 17 00:00:00 2001
From: Sachin Daluja <30343-sachindaluja@users.noreply.gitlab.gnome.org>
Date: Sun, 10 May 2020 22:30:03 -0400
Subject: [PATCH] window, window-slot: Save and restore navigation history
When a new window slot instance replaces the existing one to handle the new
location.
This allows back and forward history lists to be preserved when the window
switches between instances of different window slot classes.
Closes https://gitlab.gnome.org/GNOME/nautilus/-/issues/32
---
src/nautilus-window-slot.c | 48 +++++++++++++++++++---
src/nautilus-window-slot.h | 13 ++++++
src/nautilus-window.c | 84 +++++++++++++++++++++++++++++++++++++-
3 files changed, 138 insertions(+), 7 deletions(-)
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index e688f0716..69040fc44 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -176,6 +176,9 @@ nautilus_window_slot_restore_navigation_state (NautilusWindowSlot *self,
priv = nautilus_window_slot_get_instance_private (self);
+ /* We are restoring saved history to newly created slot with no history. */
+ g_warn_if_fail (priv->back_list == NULL && priv->forward_list == NULL);
+
priv->back_list = g_steal_pointer (&data->back_list);
priv->forward_list = g_steal_pointer (&data->forward_list);
@@ -2003,12 +2006,11 @@ nautilus_window_slot_set_content_view (NautilusWindowSlot *self,
}
void
-nautilus_window_back_or_forward (NautilusWindow *window,
- gboolean back,
- guint distance,
- NautilusWindowOpenFlags flags)
+nautilus_window_slot_back_or_forward (NautilusWindowSlot *self,
+ gboolean back,
+ guint distance,
+ NautilusWindowOpenFlags flags)
{
- NautilusWindowSlot *self;
GList *list;
GFile *location;
guint len;
@@ -2016,7 +2018,6 @@ nautilus_window_back_or_forward (NautilusWindow *window,
GFile *old_location;
NautilusWindowSlotPrivate *priv;
- self = nautilus_window_get_active_slot (window);
priv = nautilus_window_slot_get_instance_private (self);
list = back ? priv->back_list : priv->forward_list;
@@ -3308,3 +3309,38 @@ nautilus_window_slot_get_loading (NautilusWindowSlot *self)
return priv->loading;
}
+
+/*
+ * Open the specified location and set up the navigation history including the
+ * back and forward lists. This function is intended to be called when switching
+ * between NautilusWindowSlot and NautilusOtherLocationsWindowSlot. It allows
+ * the navigation history accumulated in the slot being replaced to be loaded
+ * into the replacing slot.
+ *
+ * The 'location' member variable is set to the new location before calling
+ * begin_location_change() to ensure that it matches the
+ * 'current_location_bookmark' member as expected by the location change
+ * pipeline.
+ */
+void
+nautilus_window_slot_open_location_set_navigation_state (NautilusWindowSlot *self,
+ GFile *location,
+ NautilusWindowOpenFlags flags,
+ GList *new_selection,
+ NautilusLocationChangeType change_type,
+ NautilusNavigationState *navigation_state,
+ guint distance)
+{
+ NautilusWindowSlotPrivate *priv;
+
+ priv = nautilus_window_slot_get_instance_private (self);
+
+ nautilus_window_slot_restore_navigation_state (self, navigation_state);
+
+ g_clear_object (&priv->location);
+
+ priv->location = nautilus_file_get_location (navigation_state->file);
+
+ begin_location_change (self, location, NULL, new_selection,
+ change_type, distance, NULL);
+}
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index 2edc96786..cbd3454ce 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -82,6 +82,14 @@ void nautilus_window_slot_open_location_full (NautilusWindowSlot
NautilusWindowOpenFlags flags,
GList *new_selection);
+void nautilus_window_slot_open_location_set_navigation_state (NautilusWindowSlot *slot,
+ GFile *location,
+ NautilusWindowOpenFlags flags,
+ GList *new_selection,
+ NautilusLocationChangeType change_type,
+ NautilusNavigationState *navigation_state,
+ guint distance);
+
GFile * nautilus_window_slot_get_location (NautilusWindowSlot *slot);
NautilusBookmark *nautilus_window_slot_get_bookmark (NautilusWindowSlot *slot);
@@ -126,5 +134,10 @@ NautilusNavigationState* nautilus_window_slot_get_navigation_state (NautilusWind
/* Only used by slot-dnd */
NautilusView* nautilus_window_slot_get_current_view (NautilusWindowSlot *slot);
+void nautilus_window_slot_back_or_forward (NautilusWindowSlot *slot,
+ gboolean back,
+ guint distance,
+ NautilusWindowOpenFlags flags);
+
void free_navigation_state (gpointer data);
#endif /* NAUTILUS_WINDOW_SLOT_H */
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 900239cb8..af01b43e7 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -613,6 +613,7 @@ nautilus_window_open_location_full (NautilusWindow *window,
{
NautilusWindowSlot *active_slot;
gboolean new_tab_at_end;
+ NautilusNavigationState *navigation_state = NULL;
/* The location owner can be one of the slots requesting to handle an
* unhandled location. But this slot can be destroyed when switching to
@@ -644,6 +645,8 @@ nautilus_window_open_location_full (NautilusWindow *window,
}
else if (!nautilus_window_slot_handles_location (target_slot, location))
{
+ navigation_state = nautilus_window_slot_get_navigation_state (active_slot);
+
target_slot = replace_active_slot (window, location, flags);
}
@@ -655,7 +658,19 @@ nautilus_window_open_location_full (NautilusWindow *window,
nautilus_window_set_active_slot (window, target_slot);
}
- nautilus_window_slot_open_location_full (target_slot, location, flags, selection);
+ if (navigation_state != NULL)
+ {
+ nautilus_window_slot_open_location_set_navigation_state (target_slot,
+ location, flags, selection,
+ NAUTILUS_LOCATION_CHANGE_STANDARD,
+ navigation_state, 0);
+
+ free_navigation_state (navigation_state);
+ }
+ else
+ {
+ nautilus_window_slot_open_location_full (target_slot, location, flags, selection);
+ }
g_object_unref (location);
}
@@ -3099,3 +3114,70 @@ nautilus_window_search (NautilusWindow *window,
g_warning ("Trying search on a slot but no active slot present");
}
}
+
+/* Ideally, this method should be a simple wrapper for the slot method. However,
+ * going back or forward can result in a new slot (or another subclass), so we
+ * workaround that by duplicating part of nautilus_window_slot_back_or_forward()
+ */
+void
+nautilus_window_back_or_forward (NautilusWindow *window,
+ gboolean back,
+ guint distance,
+ NautilusWindowOpenFlags flags)
+{
+ NautilusWindowSlot *slot;
+ GList *next_location_list, *back_list, *forward_list;
+ GFile *next_location;
+ guint len;
+ NautilusBookmark *next_location_bookmark;
+ gboolean active_slot_handles_location;
+
+ slot = nautilus_window_get_active_slot (window);
+ back_list = nautilus_window_slot_get_back_history (slot);
+ forward_list = nautilus_window_slot_get_forward_history (slot);
+
+ next_location_list = back ? back_list : forward_list;
+
+ len = (guint) g_list_length (next_location_list);
+
+ /* If we can't move in the direction at all, just return. */
+ if (len == 0)
+ {
+ return;
+ }
+
+ /* If the distance to move is off the end of the list, go to the end
+ * of the list. */
+ if (distance >= len)
+ {
+ distance = len - 1;
+ }
+
+ next_location_bookmark = g_list_nth_data (next_location_list, distance);
+ next_location = nautilus_bookmark_get_location (next_location_bookmark);
+
+ active_slot_handles_location = nautilus_window_slot_handles_location (slot, next_location);
+
+ if (!active_slot_handles_location)
+ {
+ NautilusNavigationState *navigation_state;
+ NautilusLocationChangeType location_change_type;
+
+ navigation_state = nautilus_window_slot_get_navigation_state (slot);
+
+ location_change_type = back ? NAUTILUS_LOCATION_CHANGE_BACK : NAUTILUS_LOCATION_CHANGE_FORWARD;
+
+ slot = replace_active_slot (window, next_location, flags);
+
+ nautilus_window_slot_open_location_set_navigation_state (slot,
+ next_location, flags, NULL,
+ location_change_type,
+ navigation_state, distance);
+
+ free_navigation_state (navigation_state);
+ }
+ else
+ {
+ nautilus_window_slot_back_or_forward (slot, back, distance, flags);
+ }
+}
--
2.35.1

View File

@ -1,302 +1,313 @@
%global glib2_version 2.55.1
%global gnome_desktop3_version 3.0.0
%global gtk3_version 3.22.26
%global libxml2_version 2.7.8
%global libexif_version 0.6.20
%global exempi_version 2.1.0
%global gsettings_desktop_schemas_version 3.8.0
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 46.2-3
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
Name: nautilus
Version: 3.28.1
Release: 25%{?dist}
Summary: File manager for GNOME
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 46.2-2
- Bump release for June 2024 mass rebuild
License: GPLv3+
URL: https://wiki.gnome.org/Apps/Nautilus
Source0: https://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
* Tue May 28 2024 David King <amigadave@amigadave.com> - 46.2-1
- Update to 46.2
Patch0: 0001-dbus-manager-Implement-trashing-files.patch
Patch1: 0002-dbus-manager-Implement-creation-of-new-folders.patch
Patch2: 0003-dbus-manager-Implement-undo-redo.patch
Patch3: 0004-dbus-manager-Use-a-more-robust-copy-operation.patch
Patch4: 0005-file-operations-Don-t-crash-if-source-file-not-prese.patch
Patch5: 0006-properties-window-Keep-alive-properties-window-if-ca.patch
Patch6: 0007-dbus-manager-Keep-application-alive-for-operations.patch
Patch7: 0008-dbus-manager-Drop-copy-file-operation.patch
Patch8: 0009-dbus-Implement-move-operation.patch
Patch9: 0010-dbus-manager-Fix-double-free.patch
Patch10: 0011-dbus-manager-Fix-not-holding-application.patch
Patch11: 0012-clipboard-Use-text-based-clipboard-only.patch
Patch12: 0013-dbus-manager-Provide-undo-status.patch
Patch13: 0014-clipboard-Prevent-crash-when-selection-data-is-empty.patch
Patch14: add-desktop-icons-rename.patch
Patch15: remove-nfs-support-strings.patch
Patch16: fix-criticals-when-connecting-to-remote-locations.patch
Patch17: man-remove-geometry-option.patch
Patch18: org.gnome.Nautilus.appdata.xml.in.in-No-screenshots-.patch
Patch19: data-Fix-caption-capitalisation-in-appdata-file.patch
Patch20: window-Add-website-link-to-About-dialog.patch
Patch21: appdata-Use-Files-instead-of-Nautilus.patch
Patch22: docs-Add-nautilus-autorun-software-man-page.patch
* Sun Apr 21 2024 David King <amigadave@amigadave.com> - 46.1-1
- Update to 46.1
# https://bugzilla.redhat.com/show_bug.cgi?id=1721133
Patch23: window-Fix-criticals-when-moving-file-to-trash.patch
* Tue Mar 19 2024 David King <amigadave@amigadave.com> - 46.0-1
- Update to 46.0
# https://bugzilla.redhat.com/show_bug.cgi?id=1721124
Patch24: properties-window-Fix-criticals-when-closing.patch
Patch25: properties-window-Fix-crashes-when-cancelled.patch
Patch26: properties-window-Fix-crashes-when-opened-multiple-t.patch
* Fri Mar 08 2024 David King <amigadave@amigadave.com> - 46~rc-1
- Update to 46.rc
# https://bugzilla.redhat.com/show_bug.cgi?id=1646352
Patch27: search-engine-tracker-Do-not-lose-filename-results-d.patch
* Wed Feb 14 2024 David King <amigadave@amigadave.com> - 46~beta-1
- Update to 46.beta
# https://bugzilla.redhat.com/show_bug.cgi?id=1207179
Patch28: files-view-Clear-selection-if-any-files-don-t-match-.patch
* Mon Jan 29 2024 David King <amigadave@amigadave.com> - 46~alpha.1-1
- Update to 46.alpha.1
# https://bugzilla.redhat.com/show_bug.cgi?id=1566027
Patch29: properties-window-Fix-endless-content-size-calculati.patch
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 46~alpha.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
# https://bugzilla.redhat.com/show_bug.cgi?id=1778579
Patch30: file-operations-Honor-umask-when-creating-new-files.patch
* Mon Jan 22 2024 David King <amigadave@amigadave.com> - 46~alpha.0-1
- Update to 46.alpha.0
# https://bugzilla.redhat.com/show_bug.cgi?id=1816070
Patch31: nautilus-mime-actions.c-No-Application-Installed-dia.patch
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 45.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
# https://bugzilla.redhat.com/show_bug.cgi?id=1847061
Patch32: search-engine-tracker-Fix-broken-query-under-some-lo.patch
Patch33: search-engine-tracker-Expand-macro-as-string.patch
* Wed Dec 06 2023 Kalev Lember <klember@redhat.com> - 45.2.1-1
- Update to 45.2.1
# https://bugzilla.redhat.com/show_bug.cgi?id=1906499
Patch34: nautilus-file.c-Fix-open-writable-file-in-recent-tab.patch
* Sun Oct 22 2023 Kalev Lember <klember@redhat.com> - 45.1-1
- Update to 45.1
# https://bugzilla.redhat.com/show_bug.cgi?id=2068092
Patch35: window-Streamline-RestoreTabData-memory-management.patch
Patch36: window-slot-Rename-RestoreTabData-to-NautilusNavigat.patch
Patch37: window-window-slot-Save-and-restore-navigation-histo.patch
* Wed Sep 20 2023 Kalev Lember <klember@redhat.com> - 45.0-1
- Update to 45.0
# https://bugzilla.redhat.com/show_bug.cgi?id=2068089
Patch38: Add-actions-to-the-toolbar.patch
* Tue Sep 05 2023 Kalev Lember <klember@redhat.com> - 45~rc-1
- Update to 45.rc
# https://bugzilla.redhat.com/show_bug.cgi?id=2094431
Patch39: files-view-Add-menu-item-to-copy-current-path.patch
Patch40: files-view-Backport-translations.patch
* Sat Aug 26 2023 Kalev Lember <klember@redhat.com> - 45~beta2-1
- Update to 45.beta2
# https://bugzilla.redhat.com/show_bug.cgi?id=2106241
Patch41: nautilus-canvas-container-Remove-the-include-visible.patch
* Fri Aug 11 2023 Kalev Lember <klember@redhat.com> - 45~beta-1
- Update to 45.beta
# https://bugzilla.redhat.com/show_bug.cgi?id=2150894
Patch42: Revert-application-add-common-startup-code.patch
Patch43: application-Export-FileManager1-iface-from-dbus_regi.patch
Patch44: freedesktop-dbus-Try-to-own-the-name-until-after-exp.patch
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 45~alpha-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
# https://bugzilla.redhat.com/show_bug.cgi?id=2100426
Patch45: window-slot-Try-current-location-even-if-it-is-marke.patch
Patch46: window-slot-Force-reload-current-location-when-it-re.patch
Patch47: pathbar-Do-nothing-when-current-location-disappears.patch
Patch48: file-utilities-Prevent-passing-NULL-to-g_object_unre.patch
Patch49: window-slot-Fix-conditions-to-restore-selection-when.patch
* Mon Jul 03 2023 Kalev Lember <klember@redhat.com> - 45~alpha-1
- Update to 45.alpha
BuildRequires: gtk-doc
BuildRequires: meson
BuildRequires: gcc
BuildRequires: pkgconfig(exempi-2.0) >= %{exempi_version}
BuildRequires: pkgconfig(gexiv2)
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gnome-autoar-0)
BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop3_version}
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version}
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(libexif) >= %{libexif_version}
BuildRequires: pkgconfig(libxml-2.0) >= %{libxml2_version}
BuildRequires: pkgconfig(tracker-sparql-2.0)
BuildRequires: pkgconfig(x11)
BuildRequires: /usr/bin/appstream-util
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: libselinux-devel
* Mon Jun 26 2023 Ondrej Holy <oholy@redhat.com> - 44.2.1-2
- Disable cloudproviders in RHEL
Requires: glib2%{_isa} >= %{glib2_version}
Requires: gsettings-desktop-schemas%{_isa} >= %{gsettings_desktop_schemas_version}
Requires: gtk3%{_isa} >= %{gtk3_version}
Requires: gvfs%{_isa}
Requires: libexif%{_isa} >= %{libexif_version}
# the main binary links against libnautilus-extension.so
# don't depend on soname, rather on exact version
Requires: %{name}-extensions%{_isa} = %{version}-%{release}
* Mon Jun 05 2023 Kalev Lember <klember@redhat.com> - 44.2.1-1
- Update to 44.2.1
# Explicitly conflict with older gedit for "enable-delete" setting removal
Conflicts: gedit < 2:3.16.0
* Wed May 31 2023 Kalev Lember <klember@redhat.com> - 44.2-1
- Update to 44.2
%description
Nautilus is the file manager and graphical shell for the GNOME desktop
that makes it easy to manage your files and the rest of your system.
It allows to browse directories on local and remote filesystems, preview
files and launch applications associated with them.
It is also responsible for handling the icons on the GNOME desktop.
* Tue Apr 25 2023 David King <amigadave@amigadave.com> - 44.1-2
- Raise requirement on gtk4
%package extensions
Summary: Nautilus extensions library
License: LGPLv2+
* Mon Apr 24 2023 David King <amigadave@amigadave.com> - 44.1-1
- Update to 44.1
%description extensions
This package provides the libraries used by nautilus extensions.
* Fri Mar 17 2023 David King <amigadave@amigadave.com> - 44.0-1
- Update to 44.0 (#2159040)
%package devel
Summary: Support for developing nautilus extensions
License: LGPLv2+
Requires: %{name}%{_isa} = %{version}-%{release}
Requires: %{name}-extensions%{_isa} = %{version}-%{release}
* Thu Mar 16 2023 Adam Williamson <awilliam@redhat.com> - 44~rc-2
- Backport MR #1151 to fix drag-and-drop (#2176766)
%description devel
This package provides libraries and header files needed
for developing nautilus extensions.
* Sun Mar 05 2023 David King <amigadave@amigadave.com> - 44~rc-1
- Update to 44.rc
%prep
%autosetup -p1
* Wed Feb 15 2023 David King <amigadave@amigadave.com> - 44~beta-1
- Update to 44.beta
# Remove -Werror from compiler flags
sed -i '/-Werror/d' meson.build
* Fri Feb 10 2023 David King <amigadave@amigadave.com> - 44~alpha-2
- Update tracker-miners dependency
%build
%meson -Ddocs=true -Dselinux=true
%meson_build
* Mon Feb 06 2023 David King <amigadave@amigadave.com> - 44~alpha-1
- Update to 44.alpha
%install
%meson_install
rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 43.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
%find_lang %name
* Sun Jan 08 2023 David King <amigadave@amigadave.com> - 43.2-1
- Update to 43.2
%check
appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Nautilus.appdata.xml
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
* Tue Dec 06 2022 David King <amigadave@amigadave.com> - 43.1-1
- Update to 43.1
%ldconfig_scriptlets extensions
* Fri Sep 30 2022 Adam Williamson <awilliam@redhat.com> - 43.0-2
- Backport MR #977 to revert broken high-res thumbnails (#2127618)
%files -f %{name}.lang
%doc NEWS README.md
%license LICENSE
%{_datadir}/applications/*
%{_bindir}/*
%{_datadir}/dbus-1/services/org.gnome.Nautilus.service
%{_datadir}/dbus-1/services/org.freedesktop.FileManager1.service
%dir %{_datadir}/gnome-shell
%dir %{_datadir}/gnome-shell/search-providers
%{_datadir}/gnome-shell/search-providers/org.gnome.Nautilus.search-provider.ini
%{_datadir}/icons/hicolor/*/apps/org.gnome.Nautilus.png
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Nautilus-symbolic.svg
%{_mandir}/man1/nautilus.1*
%{_mandir}/man1/nautilus-autorun-software.1*
%{_datadir}/glib-2.0/schemas/org.gnome.nautilus.gschema.xml
%{_datadir}/metainfo/org.gnome.Nautilus.appdata.xml
%dir %{_libdir}/nautilus
%dir %{_libdir}/nautilus/extensions-3.0
%{_libdir}/nautilus/extensions-3.0/libnautilus-image-properties.so
%{_libdir}/nautilus/extensions-3.0/libnautilus-sendto.so
* Tue Sep 20 2022 Kalev Lember <klember@redhat.com> - 43.0-1
- Update to 43.0
%files extensions
%license libnautilus-extension/LICENSE
%{_libdir}/libnautilus-extension.so.*
%{_libdir}/girepository-1.0/*.typelib
%dir %{_libdir}/nautilus
* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 43~rc-1
- Update to 43.rc
%files devel
%{_includedir}/nautilus
%{_libdir}/pkgconfig/*
%{_libdir}/*.so
%{_datadir}/gir-1.0/*.gir
* Wed Aug 17 2022 Kalev Lember <klember@redhat.com> - 43~beta.1-2
- Drop temporary libnautilus-extension ABI compat
%changelog
* Wed Jun 14 2023 Ondrej Holy <oholy@redhat.com> - 3.28.1-25
- Force reload current location when it reappears (#2100426)
* Tue Aug 09 2022 Kalev Lember <klember@redhat.com> - 43~beta.1-1
- Update to 43.beta.1
* Wed Apr 05 2023 Ondrej Holy <oholy@redhat.com> - 3.28.1-24
- Try current location even if it is marked as gone (#2100426)
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 43~alpha-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Feb 23 2023 Ondrej Holy <oholy@redhat.com> - 3.28.1-23
- Try to own the name until after exporting skeleton (#2150894)
* Mon Jul 18 2022 Kalev Lember <klember@redhat.com> - 43~alpha-3
- Rebuild
* Wed Feb 01 2023 Ondrej Holy <oholy@redhat.com> - 3.28.1-22
- Export FileManager1 iface from dbus_register vfunc (#2150894)
* Mon Jul 18 2022 Kalev Lember <klember@redhat.com> - 43~alpha-2
- Install previous libnautilus-extension soname for temporary ABI compat
* Thu Sep 22 2022 Ondrej Holy <oholy@redhat.com> - 3.28.1-21
- Backport "_Copy Location" translations (#2099981)
* Mon Jul 18 2022 Kalev Lember <klember@redhat.com> - 43~alpha-1
- Update to 43.alpha
- Always build with libportal support
- Switch to gtk4
* Tue Aug 9 2022 Ondrej Holy <oholy@redhat.com> - 3.28.1-20
- Fix scrolling issues in the icon view on focus changes (#2106241)
* Sun May 29 2022 David King <amigadave@amigadave.com> - 42.2-1
- Update to 42.2
* Fri Jul 29 2022 Ondrej Holy <oholy@redhat.com> - 3.28.1-19
- Fix the "Copy Location" action to copy just the plain path (#2094431)
* Sun Apr 24 2022 David King <amigadave@amigadave.com> - 42.1-1
- Update to 42.1.1
* Mon Jun 20 2022 Ondrej Holy <oholy@redhat.com> - 3.28.1-18
- Add toolbar action to copy current location (#2094431)
* Sat Mar 19 2022 David King <amigadave@amigadave.com> - 42.0-1
- Update to 42.0
* Mon Jun 6 2022 Ondrej Holy <oholy@redhat.com> - 3.28.1-17
- Add actions to the toolbar (#2068089)
* Mon Mar 07 2022 David King <amigadave@amigadave.com> - 42~rc-1
- Update to 42.rc
* Wed Apr 13 2022 Ondrej Holy <oholy@redhat.com> - 3.28.1-16
- Save and restore navigation history when changing window slot (#2068092)
* Mon Feb 28 2022 David King <amigadave@amigadave.com> - 42~beta-2
- Fix thumbnail drop shadow refresh bug
* Wed Jan 6 2021 Ondrej Holy <oholy@redhat.com> - 3.28.1-15
- Fix activation_uri handling to prevent invalid bookmarks (rhbz#1906499)
* Sun Feb 13 2022 David King <amigadave@amigadave.com> - 42~beta-1
- Update to 42.beta
* Fri Jun 19 2020 Ondrej Holy <oholy@redhat.com> - 3.28.1-14
- Fix broken tracker query under certain locales (rhbz#1847061)
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 42~alpha-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Apr 17 2020 Ondrej Holy <oholy@redhat.com> - 3.28.1-13
- Clear selection if any files don't match the pattern (rhbz#1207179)
- Fix endless content size calculations (rhbz#1566027)
- Honor umask when creating new files (rhbz#1778579)
- Close "There is no application..." dialog after response (rhbz#1816070)
* Wed Jan 12 2022 David King <amigadave@amigadave.com> - 42~alpha-2
- Rebuild against gnome-desktop4
* Mon Dec 9 2019 Ondrej Holy <oholy@redhat.com> - 3.28.1-12
- Do not lose filename results due to stop words (rhbz#1646352)
* Sun Jan 09 2022 David King <amigadave@amigadave.com> - 42~alpha-1
- Update to 42.alpha
* Thu Sep 26 2019 Ondrej Holy <oholy@redhat.com> - 3.28.1-11
- Fix criticals when moving file to trash (rhbz#1721133)
- Fix criticals when closing properties window (rhbz#1721124)
* Tue Dec 07 2021 Ondrej Holy <oholy@redhat.com> - 41.1-2
- Fix cropped popover for compress formats on X11
* Thu Jul 4 2019 Ondrej Holy <oholy@redhat.com> - 3.28.1-10
- Add screenshots for GNOME Software in Appdata file (rhbz#1725107)
- Add website link to About dialog (rhbz#1725101)
- Use Files instead of Nautilus in Appdata file (rhbz#1725120)
- Add nautilus-autorun-software man page (rhbz#1725766)
* Mon Nov 01 2021 Kalev Lember <klember@redhat.com> - 41.1-1
- Update to 41.1
* Fri May 31 2019 Ondrej Holy <oholy@redhat.com> - 3.28.1-9
- Fix criticals when connecting to remote locations (rhbz#1643175)
- Remove geometry option from man page (rhbz#1612852)
* Fri Sep 17 2021 Kalev Lember <klember@redhat.com> - 41.0-1
- Update to 41.0
* Tue Apr 30 2019 Carlos Soriano <csoriano@redhat.com> - 3.26.1-8
- Remove NFS support strings, since libnfs is not in RHEL
Resolves: RHBZ#1704704
* Wed Sep 08 2021 Kalev Lember <klember@redhat.com> - 41~rc-1
- Update to 41.rc
* Mon Apr 29 2019 Carlos Soriano <csoriano@redhat.com> - 3.28.1-7
- Disable extension doc generation, since generated files differ and
rpmlint fails when checking that both architectures of the -devel
library generate the same files.
It's an issue in docbook, used by gtk-doc, and althought fixed upstream
they didn't have a new release yet.
https://github.com/docbook/xslt10-stylesheets/issues/54
Resolves: RHBZ#1667136
* Mon Aug 16 2021 Kalev Lember <klember@redhat.com> - 41~beta-1
- Update to 41.beta
* Thu Apr 25 2019 Carlos Soriano <csoriano@redhat.com> - 3.28.1-6
- Implement support for desktop icons renaming
Resolves: RHBZ#1667136
* Tue Aug 03 2021 Kalev Lember <klember@redhat.com> - 41~alpha-1
- Update to 41.alpha
* Mon Nov 26 2018 Carlos Soriano <csoriano@redhat.com> - 3.28.1-5
- Fix crash with new clipboard handling
Resolves: RHBZ#1629002
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 40.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Aug 21 2018 Carlos Soriano <csoriano@redhat.com> - 3.28.1-4
- Provide undo/redo status over dbus for the desktop icons integration
* Thu May 20 2021 Ondrej Holy <oholy@redhat.com> - 40.1-3
- Add missing bundled(libgd) provides statement
* Wed Aug 15 2018 Carlos Soriano <csoriano@redhat.com> - 3.28.1-3
- Implement text based clipboard for desktop icons integration
Resolves: RHBZ#1616190
* Thu May 06 2021 Kalev Lember <klember@redhat.com> - 40.1-2
- Backport upstream fix to keep working directory when executing programs
* Tue Aug 14 2018 Carlos Soriano <csoriano@redhat.com> - 3.28.1-2
- Add desktop icons integration
* Wed May 05 2021 Kalev Lember <klember@redhat.com> - 40.1-1
- Update to 40.1
* Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40.0-1
- Update to 40.0
* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 40~rc-1
- Update to 40.rc
* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 40~beta-2
- Only require libportal for Flatpak builds
* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
- Update to 40.beta
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Nov 25 2020 Kalev Lember <klember@redhat.com> - 3.38.2-1
- Update to 3.38.2
* Mon Oct 5 2020 Kalev Lember <klember@redhat.com> - 3.38.1-1
- Update to 3.38.1
* Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 3.38.0-1
- Update to 3.38.0
* Tue Sep 08 2020 Kalev Lember <klember@redhat.com> - 3.37.92-1
- Update to 3.37.92
- Switch to tracker3
- Tighten nautilus-extensions soname glob
- Fix directory ownership for /usr/lib/nautilus/extensions-3.0 directory
* Fri Aug 21 2020 Kalev Lember <klember@redhat.com> - 3.37.91-1
- Update to 3.37.91
* Tue Aug 18 2020 Kalev Lember <klember@redhat.com> - 3.37.90-1
- Update to 3.37.90
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.37.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Mar 27 2020 Kalev Lember <klember@redhat.com> - 3.37.1-1
- Update to 3.37.1
* Fri Mar 06 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
- Update to 3.36.0
* Mon Mar 02 2020 Kalev Lember <klember@redhat.com> - 3.35.92-1
- Update to 3.35.92
* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 3.35.91.1-1
- Update to 3.35.91.1
* Thu Feb 06 2020 Bastien Nocera <bnocera@redhat.com> - 3.35.90-2
+ nautilus-3.35.90-2
- Fix launching multiple files at once
* Sun Feb 02 2020 Kalev Lember <klember@redhat.com> - 3.35.90-1
- Update to 3.35.90
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 3.35.2-2
- Rebuilt for libgnome-desktop soname bump
* Mon Dec 02 2019 Kalev Lember <klember@redhat.com> - 3.35.2-1
- Update to 3.35.2
* Wed Nov 27 2019 Kalev Lember <klember@redhat.com> - 3.34.2-1
- Update to 3.34.2
* Mon Oct 07 2019 Kalev Lember <klember@redhat.com> - 3.34.1-1
- Update to 3.34.1
* Tue Sep 10 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
- Update to 3.34.0
* Tue Aug 20 2019 Kalev Lember <klember@redhat.com> - 3.33.90-1
- Update to 3.33.90
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun May 12 2019 Ernestas Kulik <ekulik@redhat.com> - 3.32.1-2
- Add tracker-miners dependency (rhbz#1695400)
* Mon May 06 2019 Kalev Lember <klember@redhat.com> - 3.32.1-1
- Update to 3.32.1
* Wed Mar 13 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
- Update to 3.32.0
- Move libtotem-properties-page.so extension here from totem-nautilus
* Wed Feb 06 2019 Kalev Lember <klember@redhat.com> - 3.31.90-1
- Update to 3.31.90
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.30.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sun Dec 16 2018 Phil Wyett <philwyett@kathenas.org> - 3.30.5-1
- Update to 3.30.5
* Wed Nov 21 2018 Kalev Lember <klember@redhat.com> - 3.30.4-1
- Update to 3.30.4
* Wed Oct 31 2018 Kalev Lember <klember@redhat.com> - 3.30.3-1
- Update to 3.30.3
* Fri Oct 12 2018 Kalev Lember <klember@redhat.com> - 3.30.2-1
- Update to 3.30.2
* Wed Oct 03 2018 Kalev Lember <klember@redhat.com> - 3.30.1-1
- Update to 3.30.1
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 3.30.0-2
- Rebuilt against fixed atk (#1626575)
* Thu Sep 06 2018 Kalev Lember <klember@redhat.com> - 3.30.0-1
- Update to 3.30.0
* Mon Aug 13 2018 Kalev Lember <klember@redhat.com> - 3.29.90.1-1
- Update to 3.29.90.1
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Apr 09 2018 Kalev Lember <klember@redhat.com> - 3.28.1-1
- Update to 3.28.1

13
default-terminal.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/nautilus-dbus-launcher.c b/src/nautilus-dbus-launcher.c
index bd5f5c5ec..b3f8e4db9 100644
--- a/src/nautilus-dbus-launcher.c
+++ b/src/nautilus-dbus-launcher.c
@@ -287,6 +287,6 @@ nautilus_dbus_launcher_init (NautilusDBusLauncher *self)
"org.gtk.Application");
nautilus_dbus_launcher_create_proxy (self->data[NAUTILUS_DBUS_LAUNCHER_CONSOLE],
- "org.gnome.Console", "/org/gnome/Console",
+ "org.gnome.Ptyxis", "/org/gnome/Ptyxis",
"org.freedesktop.Application");
}

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

152
nautilus.spec Normal file
View File

@ -0,0 +1,152 @@
%bcond cloudproviders %{undefined rhel}
%global glib2_version 2.79.0
%global gnome_autoar_version 0.4.4
%global gtk4_version 4.15.2
%global libadwaita_version 1.6~beta
Name: nautilus
Version: 47.1
%global tarball_version %%(echo %{version} | tr '~' '.')
%global major_version %%(cut -d "." -f 1 <<<%{tarball_version})
Release: %autorelease
Summary: File manager for GNOME
# Sources are GPL-3.0-or-later and Appdata is CC0-1.0.
License: GPL-3.0-or-later AND CC0-1.0
URL: https://apps.gnome.org/Nautilus/
Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz
# https://pagure.io/fedora-workstation/issue/442
Patch: default-terminal.patch
BuildRequires: desktop-file-utils
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: meson
BuildRequires: pkgconfig(gexiv2)
BuildRequires: pkgconfig(gi-docgen)
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gnome-autoar-0) >= %{gnome_autoar_version}
BuildRequires: pkgconfig(gnome-desktop-4)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
BuildRequires: pkgconfig(gstreamer-tag-1.0)
BuildRequires: pkgconfig(gtk4) >= %{gtk4_version}
BuildRequires: pkgconfig(libadwaita-1) >= %{libadwaita_version}
%if %{with cloudproviders}
BuildRequires: pkgconfig(cloudproviders)
%endif
BuildRequires: pkgconfig(libportal)
BuildRequires: pkgconfig(libportal-gtk4)
BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(tracker-sparql-3.0)
BuildRequires: pkgconfig(x11)
BuildRequires: /usr/bin/appstream-util
Requires: glib2%{_isa} >= %{glib2_version}
Requires: gnome-autoar%{_isa} >= %{gnome_autoar_version}
Requires: gsettings-desktop-schemas%{_isa}
Requires: gtk4%{_isa} >= %{gtk4_version}
Requires: gvfs%{_isa}
Requires: libadwaita%{_isa} >= %{libadwaita_version}
# the main binary links against libnautilus-extension.so
# don't depend on soname, rather on exact version
Requires: %{name}-extensions%{_isa} = %{version}-%{release}
# For the org.freedesktop.Tracker3.Miner.Files GSettings schema.
Requires: tracker-miners
Provides: bundled(libgd)
%description
Nautilus is the file manager and graphical shell for the GNOME desktop
that makes it easy to manage your files and the rest of your system.
It allows to browse directories on local and remote filesystems, preview
files and launch applications associated with them.
It is also responsible for handling the icons on the GNOME desktop.
%package extensions
Summary: Nautilus extensions library
License: LGPL-2.1-or-later
%description extensions
This package provides the libraries used by nautilus extensions.
%package devel
Summary: Support for developing nautilus extensions
License: LGPL-2.1-or-later
Requires: %{name}%{_isa} = %{version}-%{release}
Requires: %{name}-extensions%{_isa} = %{version}-%{release}
%description devel
This package provides libraries and header files needed
for developing nautilus extensions.
%prep
%autosetup -p1 -n %{name}-%{tarball_version}
# Remove -Werror from compiler flags
sed -i '/-Werror/d' meson.build
%build
%meson \
-Ddocs=true \
-Dextensions=true \
-Dintrospection=true \
-Dselinux=true \
-Dcloudproviders=%{?with_cloudproviders:true}%{?!with_cloudproviders:false}
%{nil}
%meson_build
%install
%meson_install
%find_lang %{name}
%check
appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/org.gnome.Nautilus.metainfo.xml
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
%files -f %{name}.lang
%doc NEWS README.md
%license LICENSE
%{_datadir}/applications/*
%{_bindir}/*
%{_datadir}/dbus-1/services/org.freedesktop.FileManager1.service
%{_datadir}/dbus-1/services/org.gnome.Nautilus.service
%exclude %{_datadir}/dbus-1/services/org.gnome.Nautilus.Tracker3.Miner.Extract.service
%exclude %{_datadir}/dbus-1/services/org.gnome.Nautilus.Tracker3.Miner.Files.service
%dir %{_datadir}/gnome-shell
%dir %{_datadir}/gnome-shell/search-providers
%{_datadir}/gnome-shell/search-providers/org.gnome.Nautilus.search-provider.ini
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Nautilus.svg
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Nautilus-symbolic.svg
%{_mandir}/man1/nautilus.1*
%{_mandir}/man1/nautilus-autorun-software.1*
%{_datadir}/glib-2.0/schemas/org.gnome.nautilus.gschema.xml
%{_datadir}/nautilus/
%exclude %{_datadir}/localsearch3/domain-ontologies/org.gnome.Nautilus.domain.rule
%{_libdir}/nautilus/extensions-4/libnautilus-image-properties.so
%{_libdir}/nautilus/extensions-4/libtotem-properties-page.so
%{_metainfodir}/org.gnome.Nautilus.metainfo.xml
%files extensions
%license libnautilus-extension/LICENSE
%{_libdir}/libnautilus-extension.so.4*
%{_libdir}/girepository-1.0/Nautilus-4.0.typelib
%dir %{_libdir}/nautilus
%dir %{_libdir}/nautilus/extensions-4
%files devel
%{_includedir}/nautilus
%{_libdir}/pkgconfig/libnautilus-extension-4.pc
%{_libdir}/libnautilus-extension.so
%{_datadir}/gir-1.0/Nautilus-4.0.gir
%doc %{_datadir}/doc/nautilus/
%changelog
%autochangelog

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (nautilus-47.1.tar.xz) = 132139aa3d39d220ec5edf112bda97a0dd0c5f5978f7390f897679b78d30efeab63e6330ef1f9593c193f28d96919621ff4fe5a66992ee1f10b69ab9a240255b