[Pkg-xfce-commits] r5934 - in desktop/trunk/xfdesktop4/debian: . patches

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Wed Aug 17 05:28:51 UTC 2011


Author: mrpouit-guest
Date: 2011-08-17 17:28:51 +0000 (Wed, 17 Aug 2011)
New Revision: 5934

Added:
   desktop/trunk/xfdesktop4/debian/patches/
   desktop/trunk/xfdesktop4/debian/patches/01_fix-moving-files-to-desktop.patch
   desktop/trunk/xfdesktop4/debian/patches/series
Modified:
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/rules
Log:
* debian/patches:
  - 01_fix-moving-files-to-desktop.patch: fix moving files to the desktop
    by (hold shift + drag & drop).                                lp: #825137
  - series: add this patch.
* debian/rules:
  - add quilt files to POTFILES.skip and remove them at clean time.

Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2011-08-17 15:48:44 UTC (rev 5933)
+++ desktop/trunk/xfdesktop4/debian/changelog	2011-08-17 17:28:51 UTC (rev 5934)
@@ -1,3 +1,14 @@
+xfdesktop4 (4.8.2-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_fix-moving-files-to-desktop.patch: fix moving files to the desktop
+      by (hold shift + drag & drop).                                lp: #825137
+    - series: add this patch.
+  * debian/rules:
+    - add quilt files to POTFILES.skip and remove them at clean time.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 17 Aug 2011 19:16:06 +0200
+
 xfdesktop4 (4.8.2-1) unstable; urgency=low
 
   * New upstream bugfix release.

Added: desktop/trunk/xfdesktop4/debian/patches/01_fix-moving-files-to-desktop.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/01_fix-moving-files-to-desktop.patch	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/patches/01_fix-moving-files-to-desktop.patch	2011-08-17 17:28:51 UTC (rev 5934)
@@ -0,0 +1,78 @@
+From 7b5c9ef98efe7c9f13472b423d723058bbb774e1 Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis at xfce.org>
+Date: Thu, 19 May 2011 23:51:35 +0000
+Subject: Fix moving files to the desktop with shift & drag (bug #7629).
+
+Patch provided by Patrick Melo <patrickmelo.eti at gmail.com>.
+---
+diff --git a/NEWS b/NEWS
+index 73138ca..81b120d 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,9 @@
++Xfdesktop 4.8.x
++---------------
++  * Fix moving files to the desktop via shift & drag (bug #7629).
++    Reported and fixed by Patrick Melo.
++
++
+ Xfdesktop 4.8.2
+ ---------------
+   * Fix a crash on focus in when items are selected (bug #7313).
+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);
+--
+cgit 

Added: desktop/trunk/xfdesktop4/debian/patches/series
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/patches/series	2011-08-17 17:28:51 UTC (rev 5934)
@@ -0,0 +1 @@
+01_fix-moving-files-to-desktop.patch

Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules	2011-08-17 15:48:44 UTC (rev 5933)
+++ desktop/trunk/xfdesktop4/debian/rules	2011-08-17 17:28:51 UTC (rev 5934)
@@ -10,10 +10,15 @@
 export CFLAGS LDFLAGS
 
 override_dh_auto_configure:
+	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
 	dh_auto_configure -- --enable-thunarx --enable-exo \
 	 	--docdir=\$${prefix}/share/doc/xfdesktop4-data
 		--enable-desktop-menu-dir-monitor
 
+override_dh_auto_clean:
+	rm -f po/POTFILES.skip
+	dh_auto_clean
+
 override_dh_install:
 	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/*
 	




More information about the Pkg-xfce-commits mailing list