[gnome-flashback/nautilus-file-operations2: 90/92] desktop: use org.gnome.Nautilus.FileOperations2 interface
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback/nautilus-file-operations2: 90/92] desktop: use org.gnome.Nautilus.FileOperations2 interface
- Date: Tue, 7 Apr 2020 14:06:10 +0000 (UTC)
commit c1e18b022173666fd9fe75f9d27d311b916efd4e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Jan 31 17:30:00 2020 +0200
desktop: use org.gnome.Nautilus.FileOperations2 interface
gnome-flashback/libdesktop/gf-icon-view.c | 193 +++++++++++++++++----------
gnome-flashback/libdesktop/gf-icon-view.h | 15 ++-
gnome-flashback/libdesktop/gf-icon.c | 11 +-
gnome-flashback/libdesktop/gf-monitor-view.c | 20 +--
4 files changed, 155 insertions(+), 84 deletions(-)
---
diff --git a/gnome-flashback/libdesktop/gf-icon-view.c b/gnome-flashback/libdesktop/gf-icon-view.c
index e72d9b5..972cfc7 100644
--- a/gnome-flashback/libdesktop/gf-icon-view.c
+++ b/gnome-flashback/libdesktop/gf-icon-view.c
@@ -18,10 +18,11 @@
#include "config.h"
#include "gf-icon-view.h"
+#include <gdk/gdkx.h>
#include <glib/gi18n.h>
#include "dbus/gf-file-manager-gen.h"
-#include "dbus/gf-nautilus-gen.h"
+#include "dbus/gf-nautilus2-gen.h"
#include "gf-create-folder-dialog.h"
#include "gf-desktop-enum-types.h"
#include "gf-desktop-enums.h"
@@ -77,7 +78,7 @@ struct _GfIconView
GdkRectangle rubberband_rect;
GList *rubberband_icons;
- GfNautilusGen *nautilus;
+ GfNautilus2Gen *nautilus;
GfFileManagerGen *file_manager;
GtkWidget *create_folder_dialog;
@@ -109,6 +110,39 @@ static guint view_signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE (GfIconView, gf_icon_view, GTK_TYPE_EVENT_BOX)
+static GVariant *
+get_platform_data (GfIconView *self,
+ guint32 timestamp)
+{
+ GVariantBuilder builder;
+ GtkWidget *toplevel;
+ GdkWindow *window;
+ char *parent_handle;
+
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
+
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (self));
+ window = gtk_widget_get_window (toplevel);
+ parent_handle = g_strdup_printf ("x11:%lx", gdk_x11_window_get_xid (window));
+
+ g_variant_builder_add (&builder,
+ "{sv}",
+ "parent-handle",
+ g_variant_new_take_string (parent_handle));
+
+ g_variant_builder_add (&builder,
+ "{sv}",
+ "timestamp",
+ g_variant_new_uint32 (timestamp));
+
+ g_variant_builder_add (&builder,
+ "{sv}",
+ "window-position",
+ g_variant_new_string ("center"));
+
+ return g_variant_builder_end (&builder);
+}
+
static char *
build_attributes_list (const char *first,
...)
@@ -510,26 +544,26 @@ empty_trash_cb (GObject *object,
GError *error;
error = NULL;
- gf_nautilus_gen_call_empty_trash_finish (GF_NAUTILUS_GEN (object),
- res, &error);
+ gf_nautilus2_gen_call_empty_trash_finish (GF_NAUTILUS2_GEN (object),
+ res, &error);
if (error != NULL)
{
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
- g_warning ("Error creating new folder: %s", error->message);
+ g_warning ("Error emptying trash: %s", error->message);
g_error_free (error);
}
}
static void
-trash_files_cb (GObject *object,
- GAsyncResult *res,
- gpointer user_data)
+trash_uris_cb (GObject *object,
+ GAsyncResult *res,
+ gpointer user_data)
{
GError *error;
error = NULL;
- gf_nautilus_gen_call_trash_files_finish (GF_NAUTILUS_GEN (object),
+ gf_nautilus2_gen_call_trash_uris_finish (GF_NAUTILUS2_GEN (object),
res, &error);
if (error != NULL)
@@ -541,14 +575,14 @@ trash_files_cb (GObject *object,
}
static void
-rename_file_cb (GObject *object,
- GAsyncResult *res,
- gpointer user_data)
+rename_uri_cb (GObject *object,
+ GAsyncResult *res,
+ gpointer user_data)
{
GError *error;
error = NULL;
- gf_nautilus_gen_call_rename_file_finish (GF_NAUTILUS_GEN (object),
+ gf_nautilus2_gen_call_rename_uri_finish (GF_NAUTILUS2_GEN (object),
res, &error);
if (error != NULL)
@@ -567,8 +601,8 @@ copy_uris_cb (GObject *object,
GError *error;
error = NULL;
- gf_nautilus_gen_call_copy_uris_finish (GF_NAUTILUS_GEN (object),
- res, &error);
+ gf_nautilus2_gen_call_copy_uris_finish (GF_NAUTILUS2_GEN (object),
+ res, &error);
if (error != NULL)
{
@@ -586,8 +620,8 @@ move_uris_cb (GObject *object,
GError *error;
error = NULL;
- gf_nautilus_gen_call_move_uris_finish (GF_NAUTILUS_GEN (object),
- res, &error);
+ gf_nautilus2_gen_call_move_uris_finish (GF_NAUTILUS2_GEN (object),
+ res, &error);
if (error != NULL)
{
@@ -841,8 +875,8 @@ create_folder_cb (GObject *object,
GError *error;
error = NULL;
- gf_nautilus_gen_call_create_folder_finish (GF_NAUTILUS_GEN (object),
- res, &error);
+ gf_nautilus2_gen_call_create_folder_finish (GF_NAUTILUS2_GEN (object),
+ res, &error);
if (error != NULL)
{
@@ -858,29 +892,39 @@ create_folder_dialog_response_cb (GtkDialog *dialog,
GfIconView *self)
{
GfCreateFolderDialog *folder_dialog;
- char *folder_name;
- GFile *new_file;
- char *uri;
if (response_id != GTK_RESPONSE_ACCEPT)
return;
folder_dialog = GF_CREATE_FOLDER_DIALOG (dialog);
- folder_name = gf_create_folder_dialog_get_folder_name (folder_dialog);
- new_file = g_file_get_child (self->desktop, folder_name);
- g_free (folder_name);
+ if (self->nautilus != NULL)
+ {
+ char *parent_uri;
+ char *folder_name;
+ guint32 timestamp;
- uri = g_file_get_uri (new_file);
- g_object_unref (new_file);
+ parent_uri = g_file_get_uri (self->desktop);
+ folder_name = gf_create_folder_dialog_get_folder_name (folder_dialog);
+ timestamp = gtk_get_current_event_time ();
- gf_nautilus_gen_call_create_folder (self->nautilus, uri,
- self->cancellable,
- create_folder_cb,
- NULL);
+ gf_nautilus2_gen_call_create_folder (self->nautilus,
+ parent_uri,
+ folder_name,
+ get_platform_data (self, timestamp),
+ self->cancellable,
+ create_folder_cb,
+ NULL);
+
+ g_free (parent_uri);
+ g_free (folder_name);
+ }
+ else
+ {
+ g_assert_not_reached ();
+ }
gtk_widget_destroy (GTK_WIDGET (dialog));
- g_free (uri);
}
static void
@@ -1668,17 +1712,17 @@ enumerate_desktop (GfIconView *self)
}
static void
-nautilus_ready_cb (GObject *object,
+nautilus_ready_cb (GObject *object,
GAsyncResult *res,
gpointer user_data)
{
GError *error;
- GfNautilusGen *nautilus;
+ GfNautilus2Gen *nautilus;
GfIconView *self;
error = NULL;
- nautilus = gf_nautilus_gen_proxy_new_for_bus_finish (res, &error);
+ nautilus = gf_nautilus2_gen_proxy_new_for_bus_finish (res, &error);
if (error != NULL)
{
@@ -2051,7 +2095,9 @@ trash_cb (GfIconView *self,
if (uris == NULL)
return;
- gf_icon_view_move_to_trash (self, (const char * const *) uris);
+ gf_icon_view_move_to_trash (self,
+ (const char * const *) uris,
+ gtk_get_current_event_time ());
g_strfreev (uris);
}
@@ -2868,13 +2914,13 @@ gf_icon_view_init (GfIconView *self)
self->cancellable = g_cancellable_new ();
- gf_nautilus_gen_proxy_new_for_bus (G_BUS_TYPE_SESSION,
- G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION,
- "org.gnome.Nautilus",
- "/org/gnome/Nautilus",
- self->cancellable,
- nautilus_ready_cb,
- self);
+ gf_nautilus2_gen_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION,
+ "org.gnome.Nautilus",
+ "/org/gnome/Nautilus/FileOperations2",
+ self->cancellable,
+ nautilus_ready_cb,
+ self);
gf_file_manager_gen_proxy_new_for_bus (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION,
@@ -3023,15 +3069,18 @@ gf_icon_view_show_item_properties (GfIconView *self,
}
void
-gf_icon_view_empty_trash (GfIconView *self)
+gf_icon_view_empty_trash (GfIconView *self,
+ guint32 timestamp)
{
if (self->nautilus == NULL)
return;
- gf_nautilus_gen_call_empty_trash (self->nautilus,
- self->cancellable,
- empty_trash_cb,
- NULL);
+ gf_nautilus2_gen_call_empty_trash (self->nautilus,
+ TRUE,
+ get_platform_data (self, timestamp),
+ self->cancellable,
+ empty_trash_cb,
+ NULL);
}
gboolean
@@ -3119,62 +3168,70 @@ gf_icon_view_validate_new_name (GfIconView *self,
void
gf_icon_view_move_to_trash (GfIconView *self,
- const char * const *uris)
+ const char * const *uris,
+ guint32 timestamp)
{
if (self->nautilus == NULL)
return;
- gf_nautilus_gen_call_trash_files (self->nautilus,
+ gf_nautilus2_gen_call_trash_uris (self->nautilus,
uris,
+ get_platform_data (self, timestamp),
self->cancellable,
- trash_files_cb,
+ trash_uris_cb,
NULL);
}
void
gf_icon_view_rename_file (GfIconView *self,
const char *uri,
- const char *new_name)
+ const char *new_name,
+ guint32 timestamp)
{
if (self->nautilus == NULL)
return;
- gf_nautilus_gen_call_rename_file (self->nautilus,
+ gf_nautilus2_gen_call_rename_uri (self->nautilus,
uri,
new_name,
+ get_platform_data (self, timestamp),
self->cancellable,
- rename_file_cb,
+ rename_uri_cb,
NULL);
}
void
gf_icon_view_copy_uris (GfIconView *self,
const char * const *uris,
- const char *destination)
+ const char *destination,
+ guint32 timestamp)
{
if (self->nautilus == NULL)
return;
- gf_nautilus_gen_call_copy_uris (self->nautilus,
- uris,
- destination,
- self->cancellable,
- copy_uris_cb,
- NULL);
+ gf_nautilus2_gen_call_copy_uris (self->nautilus,
+ uris,
+ destination,
+ get_platform_data (self, timestamp),
+ self->cancellable,
+ copy_uris_cb,
+ NULL);
}
void
gf_icon_view_move_uris (GfIconView *self,
const char * const *uris,
- const char *destination)
+ const char *destination,
+ guint32 timestamp)
{
if (self->nautilus == NULL)
return;
- gf_nautilus_gen_call_move_uris (self->nautilus,
- uris,
- destination,
- self->cancellable,
- move_uris_cb,
- NULL);
+ gf_nautilus2_gen_call_move_uris (self->nautilus,
+ uris,
+ destination,
+ get_platform_data (self, timestamp),
+ self->cancellable,
+ move_uris_cb,
+ NULL);
}
diff --git a/gnome-flashback/libdesktop/gf-icon-view.h b/gnome-flashback/libdesktop/gf-icon-view.h
index 8d3be92..697ee00 100644
--- a/gnome-flashback/libdesktop/gf-icon-view.h
+++ b/gnome-flashback/libdesktop/gf-icon-view.h
@@ -47,7 +47,8 @@ GList *gf_icon_view_get_selected_icons (GfIconView *
void gf_icon_view_show_item_properties (GfIconView *self,
const char * const *uris);
-void gf_icon_view_empty_trash (GfIconView *self);
+void gf_icon_view_empty_trash (GfIconView *self,
+ guint32 timestamp);
gboolean gf_icon_view_validate_new_name (GfIconView *self,
GFileType file_type,
@@ -55,19 +56,23 @@ gboolean gf_icon_view_validate_new_name (GfIconView *
char **message);
void gf_icon_view_move_to_trash (GfIconView *self,
- const char * const *uris);
+ const char * const *uris,
+ guint32 timestamp);
void gf_icon_view_rename_file (GfIconView *self,
const char *uri,
- const char *new_name);
+ const char *new_name,
+ guint32 timestamp);
void gf_icon_view_copy_uris (GfIconView *self,
const char * const *uris,
- const char *destination);
+ const char *destination,
+ guint32 timestamp);
void gf_icon_view_move_uris (GfIconView *self,
const char * const *uris,
- const char *destination);
+ const char *destination,
+ guint32 timestamp);
G_END_DECLS
diff --git a/gnome-flashback/libdesktop/gf-icon.c b/gnome-flashback/libdesktop/gf-icon.c
index c081307..77c6fcc 100644
--- a/gnome-flashback/libdesktop/gf-icon.c
+++ b/gnome-flashback/libdesktop/gf-icon.c
@@ -385,7 +385,10 @@ rename_do_rename_cb (GfRenamePopover *popover,
char *uri;
uri = g_file_get_uri (priv->file);
- gf_icon_view_rename_file (priv->icon_view, uri, new_name);
+ gf_icon_view_rename_file (priv->icon_view,
+ uri,
+ new_name,
+ gtk_get_current_event_time ());
g_free (uri);
}
@@ -431,7 +434,9 @@ move_to_trash_cb (GtkMenuItem *item,
if (uris == NULL)
return;
- gf_icon_view_move_to_trash (priv->icon_view, (const char * const *) uris);
+ gf_icon_view_move_to_trash (priv->icon_view,
+ (const char * const *) uris,
+ gtk_get_current_event_time ());
g_strfreev (uris);
}
@@ -475,7 +480,7 @@ empty_trash_cb (GtkMenuItem *item,
priv = gf_icon_get_instance_private (self);
- gf_icon_view_empty_trash (priv->icon_view);
+ gf_icon_view_empty_trash (priv->icon_view, gtk_get_current_event_time ());
}
static void
diff --git a/gnome-flashback/libdesktop/gf-monitor-view.c b/gnome-flashback/libdesktop/gf-monitor-view.c
index c9e3d87..bdf76a1 100644
--- a/gnome-flashback/libdesktop/gf-monitor-view.c
+++ b/gnome-flashback/libdesktop/gf-monitor-view.c
@@ -456,7 +456,8 @@ get_uris_from_gnome_icon_list (GfMonitorView *self,
static void
copy_to_desktop (GfMonitorView *self,
- char **uris)
+ char **uris,
+ guint time)
{
char *desktop_uri;
@@ -464,14 +465,16 @@ copy_to_desktop (GfMonitorView *self,
gf_icon_view_copy_uris (self->icon_view,
(const char * const *) uris,
- desktop_uri);
+ desktop_uri,
+ time);
g_free (desktop_uri);
}
static void
move_to_desktop (GfMonitorView *self,
- char **uris)
+ char **uris,
+ guint time)
{
char *desktop_uri;
@@ -479,7 +482,8 @@ move_to_desktop (GfMonitorView *self,
gf_icon_view_move_uris (self->icon_view,
(const char * const *) uris,
- desktop_uri);
+ desktop_uri,
+ time);
g_free (desktop_uri);
}
@@ -582,7 +586,7 @@ drag_data_received_cb (GtkWidget *widget,
uris = get_uris_from_icon_list (self, icon);
- copy_to_desktop (self, uris);
+ copy_to_desktop (self, uris, time);
g_strfreev (uris);
success = TRUE;
@@ -603,7 +607,7 @@ drag_data_received_cb (GtkWidget *widget,
uris = get_uris_from_gnome_icon_list (self, selection_data);
- move_to_desktop (self, uris);
+ move_to_desktop (self, uris, time);
g_strfreev (uris);
success = TRUE;
@@ -618,7 +622,7 @@ drag_data_received_cb (GtkWidget *widget,
uris = get_uris_from_gnome_icon_list (self, selection_data);
- copy_to_desktop (self, uris);
+ copy_to_desktop (self, uris, time);
g_strfreev (uris);
success = TRUE;
@@ -635,7 +639,7 @@ drag_data_received_cb (GtkWidget *widget,
uris = gtk_selection_data_get_uris (data);
- copy_to_desktop (self, uris);
+ copy_to_desktop (self, uris, time);
g_strfreev (uris);
success = TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
