[gwenview] stop the thumbnailing when Gwenview exits; This is important as it

[Lukas Tinkl]

commit 3e9c3abc61292dc67ebbe3765fa8d80a32b1dd1d
Author: Lukas Tinkl <lukas at kde.org>
Date:   Mon Aug 6 16:17:35 2012 +0200

    stop the thumbnailing when Gwenview exits; This is important as it
    
      blocks unmounting of flash drives

 ..._r3dbd4e95c9494d4ae5ed51ebfbfa75efeceff97f.diff |   35 ++++++++++++++++++++
 gwenview.spec                                      |    8 ++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/changeset_r3dbd4e95c9494d4ae5ed51ebfbfa75efeceff97f.diff b/changeset_r3dbd4e95c9494d4ae5ed51ebfbfa75efeceff97f.diff
new file mode 100644
index 0000000..d2af730
--- /dev/null
+++ b/changeset_r3dbd4e95c9494d4ae5ed51ebfbfa75efeceff97f.diff
@@ -0,0 +1,35 @@
+commit 3dbd4e95c9494d4ae5ed51ebfbfa75efeceff97f
+Author: Benni Hill <benni at mytum.de>
+Date:   Thu Aug 2 18:06:44 2012 +0200
+
+    Stop thumbnailing when Gwenview exits.
+    
+    This is important as it blocks unmounting of flash drives.
+    
+    BUG: 302074
+    FIXED-IN: 2.9.1
+
+diff --git a/lib/thumbnailloadjob.cpp b/lib/thumbnailloadjob.cpp
+index 82722cd..9c9a2ee 100644
+--- a/lib/thumbnailloadjob.cpp
++++ b/lib/thumbnailloadjob.cpp
+@@ -424,6 +424,7 @@ ThumbnailLoadJob::~ThumbnailLoadJob()
+     if (!sThumbnailCache->isRunning()) {
+         sThumbnailCache->start();
+     }
++    sThumbnailCache->wait();
+ }
+ 
+ void ThumbnailLoadJob::start()
+diff --git a/lib/thumbnailview/thumbnailview.cpp b/lib/thumbnailview/thumbnailview.cpp
+index 525a47f..5b2b129 100644
+--- a/lib/thumbnailview/thumbnailview.cpp
++++ b/lib/thumbnailview/thumbnailview.cpp
+@@ -329,6 +329,7 @@ ThumbnailView::ThumbnailView(QWidget* parent)
+ 
+ ThumbnailView::~ThumbnailView()
+ {
++    delete d->mThumbnailLoadJob;
+     delete d;
+ }
+ 
diff --git a/gwenview.spec b/gwenview.spec
index 7186c8b..c2ec592 100644
--- a/gwenview.spec
+++ b/gwenview.spec
@@ -1,7 +1,7 @@
 Name:    gwenview 
 Summary: An image viewer
 Version: 4.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # app: GPLv2+
 # lib:  IJG and (LGPLv2 or LGPLv3 or LGPLv3+ (KDE e.V.)) and LGPLv2+ and GPLv2+
@@ -16,6 +16,7 @@ URL:     https://projects.kde.org/projects/kde/kdegraphics/gwenview
 Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
 ## upstream patches
+Patch0:     changeset_r3dbd4e95c9494d4ae5ed51ebfbfa75efeceff97f.diff
 
 BuildRequires: desktop-file-utils
 # libkonq
@@ -45,6 +46,7 @@ Requires: %{name} = %{version}-%{release}
 
 %prep
 %setup -q
+%patch0 -p1 -b .stop-thumbnails
 
 
 %build
@@ -107,6 +109,10 @@ fi
 
 
 %changelog
+* Mon Aug 6 2012 Lukas Tinkl <ltinkl at redhat.com> - 4.9.0-2
+- stop the thumbnailing when Gwenview exits; This is important as it
+  blocks unmounting of flash drives
+
 * Thu Jul 26 2012 Lukas Tinkl <ltinkl at redhat.com> - 4.9.0-1
 - 4.9.0