[Pkg-xfce-commits] r9724 - in /desktop/trunk/thunar/debian: changelog patches/0001-Fix-object-unreferencing-Bug-12260.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Sun Feb 12 11:04:21 2017
New Revision: 9724

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=9724
Log:
* debian/patches:
  - 0001-Fix-object-unreferencing-Bug-12260 added, fix more crashes when
    moving files.                                             closes: #800723

Added:
    desktop/trunk/thunar/debian/patches/0001-Fix-object-unreferencing-Bug-12260.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=9724&op=diff
==============================================================================
--- desktop/trunk/thunar/debian/changelog	(original)
+++ desktop/trunk/thunar/debian/changelog	Sun Feb 12 11:04:21 2017
@@ -1,3 +1,11 @@
+thunar (1.6.10-6) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 0001-Fix-object-unreferencing-Bug-12260 added, fix more crashes when
+      moving files.                                             closes: #800723
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 12 Feb 2017 11:59:32 +0100
+
 thunar (1.6.10-5) unstable; urgency=medium
 
   * debian/patches:

Added: desktop/trunk/thunar/debian/patches/0001-Fix-object-unreferencing-Bug-12260.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/debian/patches/0001-Fix-object-unreferencing-Bug-12260.patch?rev=9724&op=file
==============================================================================
--- desktop/trunk/thunar/debian/patches/0001-Fix-object-unreferencing-Bug-12260.patch	(added)
+++ desktop/trunk/thunar/debian/patches/0001-Fix-object-unreferencing-Bug-12260.patch	Sun Feb 12 11:04:21 2017
@@ -0,0 +1,75 @@
+From 240a7f3b34694bb737ebbb9145b11bbc3e65553b Mon Sep 17 00:00:00 2001
+From: Vladimir Chren <vlado.chren at inmail.sk>
+Date: Thu, 9 Feb 2017 11:00:58 +0100
+Subject: [PATCH] Fix object unreferencing (Bug #12260)
+
+Object unreferencing is now called only after deferred
+function using the object returns.
+---
+ thunar/thunar-file.c | 22 ++++++++++++++++++++++
+ thunar/thunar-file.h |  1 +
+ thunar/thunar-job.c  |  3 +--
+ 3 files changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
+index c2a89d8d..c7aae58a 100644
+--- a/thunar/thunar-file.c
++++ b/thunar/thunar-file.c
+@@ -3988,6 +3988,28 @@ thunar_file_reload_idle (ThunarFile *file)
+ 
+ 
+ /**
++ * thunar_file_reload_idle_unref:
++ * @file : a #ThunarFile instance.
++ *
++ * Schedules a reload of the @file by calling thunar_file_reload
++ * when idle. When scheduled function returns @file object will be
++ * unreferenced.
++ *
++ **/
++void
++thunar_file_reload_idle_unref (ThunarFile *file)
++{
++  _thunar_return_if_fail (THUNAR_IS_FILE (file));
++
++  g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
++                   (GSourceFunc) thunar_file_reload,
++                   file,
++                   (GDestroyNotify) g_object_unref);
++}
++
++
++
++/**
+  * thunar_file_destroy:
+  * @file : a #ThunarFile instance.
+  *
+diff --git a/thunar/thunar-file.h b/thunar/thunar-file.h
+index cfc3d050..da5b2a4e 100644
+--- a/thunar/thunar-file.h
++++ b/thunar/thunar-file.h
+@@ -241,6 +241,7 @@ void              thunar_file_unwatch                    (ThunarFile
+ 
+ gboolean          thunar_file_reload                     (ThunarFile              *file);
+ void              thunar_file_reload_idle                (ThunarFile              *file);
++void              thunar_file_reload_idle_unref          (ThunarFile              *file);
+ void              thunar_file_reload_parent              (ThunarFile              *file);
+ 
+ void              thunar_file_destroy                    (ThunarFile              *file);
+diff --git a/thunar/thunar-job.c b/thunar/thunar-job.c
+index f4ce28e0..aa84cb31 100644
+--- a/thunar/thunar-job.c
++++ b/thunar/thunar-job.c
+@@ -578,8 +578,7 @@ thunar_job_new_files (ThunarJob   *job,
+           file = thunar_file_cache_lookup (lp->data);
+           if (file != NULL)
+             {
+-              thunar_file_reload_idle (file);
+-              g_object_unref (file);
++              thunar_file_reload_idle_unref (file);
+             }
+         }
+ 
+-- 
+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=9724&op=diff
==============================================================================
--- desktop/trunk/thunar/debian/patches/series	(original)
+++ desktop/trunk/thunar/debian/patches/series	Sun Feb 12 11:04:21 2017
@@ -1,3 +1,4 @@
 01_support-non-multiarch-modules.patch
 0001-Fix-crash-and-hang-while-renaming.patch
 0002-Don-t-call-g_object_ref-unref-on-objects-that-are-be.patch
+0001-Fix-object-unreferencing-Bug-12260.patch