diff options
| author | Pavel Cisler <pavel@eazel.com> | 2000-07-05 05:27:48 +0000 |
|---|---|---|
| committer | Pavel Cisler <pce@src.gnome.org> | 2000-07-05 05:27:48 +0000 |
| commit | 45e5a79ff8cbfd71af1ff37904b1c9300b2fde4e (patch) | |
| tree | fcbeaed8e005aa728cff22c92dd95f9502f7a7b6 /libnautilus-extensions/nautilus-drag.h | |
| parent | bd3c344f72be1b836c11148e78f1aed09d62e597 (diff) | |
| download | nautilus-45e5a79ff8cbfd71af1ff37904b1c9300b2fde4e.tar.gz | |
Fixed 1215 - inter-volume move now removes the source files. Made it so
2000-07-04 Pavel Cisler <pavel@eazel.com>
* src/file-manager/dfos-xfer-progress-dialog.c:
* src/file-manager/dfos-xfer-progress-dialog.h:
(handle_xfer_ok),
(fs_xfer), (fs_move_to_trash), (fs_delete), (fs_empty_trash):
* src/file-manager/dfos-xfer-progress-dialog.c:
(dfos_xfer_progress_dialog_clear):
Fixed 1215 - inter-volume move now removes the source files.
Made it so that when an inter-volume copy has ended and source files
are removed, the progress dialog updates. Added a new cleanup phase
string.
* src/file-manager/dfos-xfer-progress-dialog.c:
(dfos_xfer_progress_dialog_new_file),
(set_text_unescaped_trimmed):
Added code to unescape paths in progress dialogs.
* src/file-manager/dfos-xfer.c:
* src/file-manager/dfos-xfer.h:
(nautilus_convert_to_unescaped_string_for_display),
(handle_xfer_vfs_error), (handle_xfer_overwrite):
Added code to unescape paths in error dialogs.
* libnautilus-extensions/nautilus-drag.c:
(nautilus_drag_default_drop_action),
(nautilus_drag_modifier_based_action):
* libnautilus-extensions/nautilus-drag.h:
* libnautilus-extensions/nautilus-icon-dnd.c:
(handle_nonlocal_move), (nautilus_icon_container_find_drop_target),
(nautilus_icon_container_receive_dropped_icons),
(nautilus_icon_container_get_drop_action), (drag_motion_callback):
* libnautilus-extensions/nautilus-list.c:
(nautilus_list_drag_motion):
Reworked a whole lot to allow me to update the default copy action
based on the drag&drop context - an inter-volume drag&drop will now
suggest a copy as a default.
Moved out more sharable code into nautilus-drag.c.
Added a common routine for figuring out the drop target.
* src/file-manager/fm-directory-view.c: (fm_directory_is_trash),
(fm_directory_can_move_to_trash):
Fixed a bunch of asserts caused by unreffing NULL uris.
Diffstat (limited to 'libnautilus-extensions/nautilus-drag.h')
| -rw-r--r-- | libnautilus-extensions/nautilus-drag.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libnautilus-extensions/nautilus-drag.h b/libnautilus-extensions/nautilus-drag.h index 702743fba..c6452155a 100644 --- a/libnautilus-extensions/nautilus-drag.h +++ b/libnautilus-extensions/nautilus-drag.h @@ -102,6 +102,10 @@ gboolean nautilus_drag_can_accept_item (NautilusFile *drop_target_item, const char *item_uri); gboolean nautilus_drag_can_accept_items (NautilusFile *drop_target_item, const GList *items); +void nautilus_drag_default_drop_action (const char *target_uri, + const GList *items, + int *default_action, + int *non_default_action); gboolean nautilus_drag_drag_data_get (GtkWidget *widget, GdkDragContext *context, @@ -110,6 +114,7 @@ gboolean nautilus_drag_drag_data_get (GtkWidget *widget, guint32 time, gpointer container_context, NautilusDragEachSelectedItemIterator each_selected_item_iterator); -int nautilus_drag_modifier_based_action (void); +int nautilus_drag_modifier_based_action (int default_action, + int non_default_action); #endif |