[Pkg-xfce-commits] r9857 - in /desktop/trunk/thunar/debian: changelog patches/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Sun Jun 18 20:03:42 2017
New Revision: 9857

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=9857
Log:
* debian/patches:
  - 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134 added, fix
    a possible Thunar freeze when a lot of files are renamed in the background

Added:
    desktop/trunk/thunar/debian/patches/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch
Modified:
    desktop/trunk/thunar/debian/changelog
    desktop/trunk/thunar/debian/patches/series

Modified: desktop/trunk/thunar/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/debian/changelog?rev=9857&op=diff
==============================================================================
--- desktop/trunk/thunar/debian/changelog	(original)
+++ desktop/trunk/thunar/debian/changelog	Sun Jun 18 20:03:42 2017
@@ -1,3 +1,11 @@
+thunar (1.6.11-2) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134 added, fix
+      a possible Thunar freeze when a lot of files are renamed in the background
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 18 Jun 2017 22:02:58 +0200
+
 thunar (1.6.11-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/trunk/thunar/debian/patches/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/debian/patches/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch?rev=9857&op=file
==============================================================================
--- desktop/trunk/thunar/debian/patches/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch	(added)
+++ desktop/trunk/thunar/debian/patches/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch	Sun Jun 18 20:03:42 2017
@@ -0,0 +1,43 @@
+From 4dd549db77838c9345f10a72f10e705f8ae327d4 Mon Sep 17 00:00:00 2001
+From: Viktor Odintsev <zakhams at gmail.com>
+Date: Thu, 13 Apr 2017 01:15:53 +0300
+Subject: [PATCH] Fix deadlock in mutex causing Thunar to hang (Bug #13481)
+
+file_rename_mutex could remain locked due to the return statement
+in function thunar_file_monitor.
+---
+ thunar/thunar-file.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
+index c7aae58a..53bebbcd 100644
+--- a/thunar/thunar-file.c
++++ b/thunar/thunar-file.c
+@@ -827,16 +827,16 @@ thunar_file_monitor (GFileMonitor     *monitor,
+           else
+               other_file = thunar_file_get (other_path, NULL);
+ 
+-          if (other_file == NULL)
+-              return;
+-
+-          /* notify the thumbnail cache that we can now also move the thumbnail */
+-          thunar_file_move_thumbnail_cache_file (event_path, other_path);
++          if (other_file != NULL)
++            {
++              /* notify the thumbnail cache that we can now also move the thumbnail */
++              thunar_file_move_thumbnail_cache_file (event_path, other_path);
+ 
+-          /* reload the containing target folder */
+-          thunar_file_reload_parent (other_file);
++              /* reload the containing target folder */
++              thunar_file_reload_parent (other_file);
+ 
+-          g_object_unref (other_file);
++              g_object_unref (other_file);
++            }
+ 
+           G_UNLOCK (file_rename_mutex);
+         }
+-- 
+2.11.0
+

Modified: desktop/trunk/thunar/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/debian/patches/series?rev=9857&op=diff
==============================================================================
--- desktop/trunk/thunar/debian/patches/series	(original)
+++ desktop/trunk/thunar/debian/patches/series	Sun Jun 18 20:03:42 2017
@@ -1 +1,2 @@
 01_support-non-multiarch-modules.patch
+0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch