[nautilus] Use the actual action for GDK_ACTION_ASK drops
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] Use the actual action for GDK_ACTION_ASK drops
- Date: Tue, 3 Aug 2010 20:24:31 +0000 (UTC)
commit 5ce852673cc5d5ae45bd042f9ab07916358f349a
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue Aug 3 22:26:14 2010 +0200
Use the actual action for GDK_ACTION_ASK drops
libnautilus-private/nautilus-icon-dnd.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index 13f2b0b..b0cc626 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -967,7 +967,7 @@ handle_local_move (NautilusIconContainer *container,
static void
handle_nonlocal_move (NautilusIconContainer *container,
- GdkDragContext *context,
+ GdkDragAction action,
int x, int y,
const char *target_uri,
gboolean icon_hit)
@@ -1024,11 +1024,11 @@ handle_nonlocal_move (NautilusIconContainer *container,
/* start the copy */
g_signal_emit_by_name (container, "move_copy_items",
- source_uris,
- source_item_locations,
- target_uri,
- gdk_drag_context_get_selected_action (context),
- x, y);
+ source_uris,
+ source_item_locations,
+ target_uri,
+ action,
+ x, y);
if (free_target_uri) {
g_free ((char *)target_uri);
@@ -1216,7 +1216,7 @@ nautilus_icon_container_receive_dropped_icons (NautilusIconContainer *container,
if (local_move_only) {
handle_local_move (container, world_x, world_y);
} else {
- handle_nonlocal_move (container, context, world_x, world_y, drop_target, icon_hit);
+ handle_nonlocal_move (container, real_action, world_x, world_y, drop_target, icon_hit);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]