[nautilus/wip/muktupavels/delete] dbus: implement deleting files
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/muktupavels/delete] dbus: implement deleting files
- Date: Wed, 18 Dec 2019 12:45:03 +0000 (UTC)
commit 132a339a2e68b7e97ae806f156212c125211465e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Wed Dec 18 14:39:39 2019 +0200
dbus: implement deleting files
data/dbus-interfaces.xml | 4 ++++
src/nautilus-dbus-manager.c | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
---
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 1827f92ab..893df1b80 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -36,6 +36,10 @@
<method name='TrashFiles'>
<arg type='as' name='URIs' direction='in'/>
</method>
+ <method name='DeleteFiles'>
+ <arg type='as' name='URIs' direction='in'/>
+ <arg type='u' name='Timestamp' direction='in'/>
+ </method>
<method name='CreateFolder'>
<arg type='s' name='URI' direction='in'/>
</method>
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 43f27e10a..608ccb49f 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -231,6 +231,38 @@ handle_trash_files (NautilusDBusFileOperations *object,
return TRUE; /* invocation was handled */
}
+static void
+delete_on_finished (GHashTable *debutting_uris,
+ gboolean user_cancel,
+ gpointer callback_data)
+{
+ g_application_release (g_application_get_default ());
+}
+
+static gboolean
+handle_delete_files (NautilusDBusFileOperations *object,
+ GDBusMethodInvocation *invocation,
+ const gchar **sources,
+ guint32 timestamp,
+ NautilusDBusManager *self)
+{
+ 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]));
+ }
+
+ g_application_hold (g_application_get_default ());
+ nautilus_file_operations_delete_async (source_files, NULL,
+ delete_on_finished, NULL);
+
+ nautilus_dbus_file_operations_complete_delete_files (object, invocation);
+ return TRUE; /* invocation was handled */
+}
+
static void
rename_file_on_finished (NautilusFile *file,
GFile *result_location,
@@ -291,6 +323,10 @@ nautilus_dbus_manager_init (NautilusDBusManager *self)
"handle-trash-files",
G_CALLBACK (handle_trash_files),
self);
+ g_signal_connect (self->file_operations,
+ "handle-delete-files",
+ G_CALLBACK (handle_delete_files),
+ self);
g_signal_connect (self->file_operations,
"handle-create-folder",
G_CALLBACK (handle_create_folder),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]