diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:49:53 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:49:53 -0300 |
| commit | c02976460621a16b172e3e33432d5790f3ed6117 (patch) | |
| tree | c438b11c18e36170fd5ee7c767adda3f948e45bb /extra/xfdesktop | |
| parent | 79f56eaaa1e752a2f67072051b612acf5c648f69 (diff) | |
| parent | ae08410274473c5ab78d300ea2365c4b1070cc61 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/bdf-unifont/PKGBUILD
extra/convmv/PKGBUILD
extra/cowsay/PKGBUILD
extra/curl/PKGBUILD
extra/dbus-qt3/PKGBUILD
extra/emovix/PKGBUILD
extra/foobillard/PKGBUILD
extra/gnome-spell/PKGBUILD
extra/libssh2/PKGBUILD
extra/mkbootcd/PKGBUILD
extra/mozilla-common/PKGBUILD
extra/ndesk-dbus-glib/PKGBUILD
extra/xfwm4-themes/PKGBUILD
Diffstat (limited to 'extra/xfdesktop')
| -rw-r--r-- | extra/xfdesktop/fix-desktop-drag-and-drop.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/extra/xfdesktop/fix-desktop-drag-and-drop.patch b/extra/xfdesktop/fix-desktop-drag-and-drop.patch deleted file mode 100644 index 8c0c4bcc8..000000000 --- a/extra/xfdesktop/fix-desktop-drag-and-drop.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c -index 2711646..d3ca2eb 100644 ---- a/src/xfdesktop-file-icon-manager.c -+++ b/src/xfdesktop-file-icon-manager.c -@@ -2794,7 +2794,7 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager - GFile *tfile = NULL; - gboolean copy_only = TRUE, drop_ok = FALSE; - GList *file_list; -- -+ - if(info == TARGET_XDND_DIRECT_SAVE0) { - /* we don't suppose XdndDirectSave stage 3, result F, i.e., the app - * has to save the data itself given the filename we provided in -@@ -2816,7 +2816,7 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager - /* data is "URL\nTITLE" */ - GFile *source_file = NULL; - gchar *exo_desktop_item_edit = g_find_program_in_path("exo-desktop-item-edit"); -- -+ - if(drop_icon) { - GFileInfo *finfo = xfdesktop_file_icon_peek_file_info(XFDESKTOP_FILE_ICON(drop_icon)); - if(g_file_info_get_file_type(finfo) == G_FILE_TYPE_DIRECTORY) -@@ -2911,8 +2911,15 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager - gchar *dest_basename = g_file_get_basename(l->data); - - if(dest_basename && *dest_basename != '\0') { -- GFile *dest_file = g_file_get_child(base_dest_file, dest_basename); -- dest_file_list = g_list_prepend(dest_file_list, dest_file); -+ /* If we copy a file, we need to use the new absolute filename -+ * as the destination. If we move, we need to use the destination -+ * directory. */ -+ if(copy_only) { -+ GFile *dest_file = g_file_get_child(base_dest_file, dest_basename); -+ dest_file_list = g_list_prepend(dest_file_list, dest_file); -+ } else { -+ dest_file_list = g_list_prepend(dest_file_list, base_dest_file); -+ } - } - - g_free(dest_basename); -@@ -2923,10 +2930,10 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager - if(dest_file_list) { - dest_file_list = g_list_reverse(dest_file_list); - -- drop_ok =xfdesktop_file_utils_transfer_files(context->action, -- file_list, -- dest_file_list, -- fmanager->priv->gscreen); -+ drop_ok = xfdesktop_file_utils_transfer_files(context->action, -+ file_list, -+ dest_file_list, -+ fmanager->priv->gscreen); - } - - xfdesktop_file_utils_file_list_free(dest_file_list); - - |