[krusader] * Fri Aug 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2.0-0.5.beta1 - fix Krusader not terminati

[Kevin Kofler]

commit 8115bd6c22b896299aeb5a4480c446ae40561468
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Fri Aug 6 02:14:02 2010 +0200

    * Fri Aug 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2.0-0.5.beta1
    - fix Krusader not terminating properly (#620328, kde#240319, SF#3015094)
      (patch backported from upstream SVN trunk)

 krusader-2.2.0-beta1-fix-hang-on-close.patch |   17 +++++++++++++++++
 krusader.spec                                |   10 +++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/krusader-2.2.0-beta1-fix-hang-on-close.patch b/krusader-2.2.0-beta1-fix-hang-on-close.patch
new file mode 100644
index 0000000..06e374c
--- /dev/null
+++ b/krusader-2.2.0-beta1-fix-hang-on-close.patch
@@ -0,0 +1,17 @@
+Fix from upstream:
+
+Fix hanging session on close (leading to an increasing
+number of krusader instances on KDE start).
+
+Index: krusader/panelmanager.cpp
+===================================================================
+--- krusader/panelmanager.cpp	(revision 1137335)
++++ krusader/panelmanager.cpp	(revision 1154581)
+@@ -121,6 +121,7 @@
+ 
+ //     _stack->setUpdatesEnabled(false);
+     _stack->setCurrentWidget(_self);
++    kapp->processEvents();
+     // make sure the view is focused (this also causes ListPanel::slotFocusOnMe() to be called)
+     _self->view->widget()->setFocus();
+ //     _stack->setUpdatesEnabled(true);
diff --git a/krusader.spec b/krusader.spec
index 5bcd006..7b023fe 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -1,7 +1,7 @@
 Name:		krusader
 Version:	2.2.0
 %global beta beta1
-Release:	0.4.%{beta}%{?dist}
+Release:	0.5.%{beta}%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -24,6 +24,9 @@ Patch4:		krusader-2.2.0-beta1-force-reload.patch
 Patch5:		krusader-2.2.0-beta1-viewer-menu.patch
 # fix the text viewer not being read-only (SF#2898151)
 Patch6:		krusader-2.2.0-beta1-readonly.patch
+# fix Krusader not terminating properly (#620328, kde#240319, SF#3015094)
+# (patch backported from upstream SVN trunk)
+Patch100:	krusader-2.2.0-beta1-fix-hang-on-close.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,6 +57,7 @@ friendly, fast and looks great on your desktop! You should give it a try.
 %patch4 -p1 -b .force-reload
 %patch5 -p1 -b .viewer-menu
 %patch6 -p1 -b .readonly
+%patch100 -p0 -b .hang-on-close
 
 %build
 mkdir -p %{_target_platform}
@@ -111,6 +115,10 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/*.protocol
 
 %changelog
+* Fri Aug 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2.0-0.5.beta1
+- fix Krusader not terminating properly (#620328, kde#240319, SF#3015094)
+  (patch backported from upstream SVN trunk)
+
 * Thu Jun 03 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2.0-0.4.beta1
 - fix "rename selects extension" patch to actually select all