Merge woodenshoe-wi/rox-filer

jun7 · Sep 4, 2018 · a313dff · a313dff
1 parent b39248f
commit a313dff
Show file tree

Hide file tree

Showing 4 changed files with 239 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 
 Changes
+- **Short cut keys around Copy and Paste are changed**
+
 - https://github.com/jun7/rox-filer/wiki/Changes
 - https://github.com/jun7/rox-filer/wiki/Screenshots
 

diff --git a/ROX-Filer/src/dnd.c b/ROX-Filer/src/dnd.c
@@ -132,6 +132,7 @@ const char *drop_dest_bookmark = "drop_dest_bookmark";	/* Add to bookmarks */
 GdkAtom XdndDirectSave0;
 GdkAtom xa_text_plain;
 GdkAtom text_uri_list;
+GdkAtom gnome_copied_files;
 GdkAtom text_x_moz_url;
 GdkAtom xa_application_octet_stream;
 GdkAtom xa_string; /* Not actually used for DnD, but the others are here! */
@@ -150,6 +151,7 @@ void dnd_init(void)
 	XdndDirectSave0 = gdk_atom_intern("XdndDirectSave0", FALSE);
 	xa_text_plain = gdk_atom_intern("text/plain", FALSE);
 	text_uri_list = gdk_atom_intern("text/uri-list", FALSE);
+	gnome_copied_files = gdk_atom_intern("x-special/gnome-copied-files", FALSE);
 	text_x_moz_url = gdk_atom_intern("text/x-moz-url", FALSE);
 	xa_application_octet_stream = gdk_atom_intern("application/octet-stream",
 			FALSE);

diff --git a/ROX-Filer/src/dnd.h b/ROX-Filer/src/dnd.h
@@ -16,6 +16,7 @@ enum
 	TARGET_XDS,
 	TARGET_STRING,
 	TARGET_MOZ_URL,
+	TARGET_GNOME_COPIED_FILES,
 };
 
 typedef enum {
@@ -38,6 +39,7 @@ extern const char *drop_dest_pass_through;
 extern const char *drop_dest_bookmark;
 extern GdkAtom XdndDirectSave0;
 extern GdkAtom text_uri_list;
+extern GdkAtom gnome_copied_files;
 extern GdkAtom _rox_run_action;
 extern GdkAtom xa_application_octet_stream;
 extern GdkAtom xa_string;