[kdebase-workspace] - krunner "run command" doesn't keep any history (kde#247566)
Rex Dieter
rdieter at fedoraproject.org
Fri Aug 20 21:01:14 UTC 2010
commit fe9362e0dabbccb69ae5d1a925c5b3e3278152aa
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Aug 20 16:05:52 2010 -0500
- krunner "run command" doesn't keep any history (kde#247566)
kdebase-workspace-4.5.0-krunner_history.patch | 22 ++++++++++++++++++++++
kdebase-workspace.spec | 8 +++++++-
2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-workspace-4.5.0-krunner_history.patch b/kdebase-workspace-4.5.0-krunner_history.patch
new file mode 100644
index 0000000..57c6a35
--- /dev/null
+++ b/kdebase-workspace-4.5.0-krunner_history.patch
@@ -0,0 +1,22 @@
+--- branches/KDE/4.5/kdebase/workspace/krunner/interfaces/default/interface.cpp 2010/08/08 13:33:59 1160591
++++ branches/KDE/4.5/kdebase/workspace/krunner/interfaces/default/interface.cpp 2010/08/08 14:03:09 1160604
+@@ -473,6 +473,10 @@
+ return;
+ }
+
++ // We need to keep a copy of the query text before calling close(),
++ // in order to add it to history later on.
++ QString currentQuery = m_searchTerm->currentText().trimmed();
++
+ m_running = true;
+ // must run the result first before clearing the interface
+ // in a way that will cause the results scene to be cleared and
+@@ -484,7 +488,7 @@
+ //TODO: check if run is succesful before adding the term to history
+ // Notice that we must add items to history after calling m_resultScene->run()
+ // otherwise the query result could be reset to QString() too early.
+- m_searchTerm->addToHistory(m_searchTerm->currentText().trimmed());
++ m_searchTerm->addToHistory(currentQuery);
+
+ resetInterface();
+ }
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 002ad20..2045c7f 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -17,7 +17,7 @@ Version: 4.5.0
# for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
%define kde4workspace_version 4.5.00
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
Group: User Interface/Desktops
@@ -69,6 +69,8 @@ Patch53: kdebase-workspace-4.4.4-kdebug183143.patch
## 4.5 patches
Patch100: kdebase-workspace-4.5.0-startkde-malloc.patch
+# http://websvn.kde.org/branches/KDE/4.5/kdebase/workspace/krunner/interfaces/default/interface.cpp?r1=1160591&r2=1160604&pathrev=1160604&view=patch
+Patch101: kdebase-workspace-4.5.0-krunner_history.patch
## trunk patches
@@ -321,6 +323,7 @@ Requires: akonadi
# 4.5 patches
%patch100 -p1 -b .startkde-malloc
+%patch101 -p5 -b .krunner_history
# trunk patches
@@ -695,6 +698,9 @@ fi
%changelog
+* Fri Aug 20 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-3
+- krunner "run command" doesn't keep any history (kde#247566)
+
* Thu Aug 12 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.5.0-2
- disable malloc checking in startkde for releases
More information about the scm-commits
mailing list