From ebe8079d67d8d2ca2649cd70ca0d3c9786ed854b Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Wed, 9 Apr 2014 04:50:14 +0200
Subject: [PATCH 1/2] Prefer baloosearch over nepomuksearch for single runner
 tab entries, too.

---
 components/sourceregistry.cpp              | 21 ++++++++++++++++++++-
 components/sources/runners/runnermodel.cpp |  5 +++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/components/sourceregistry.cpp b/components/sourceregistry.cpp
index 73c2bee..d2df116 100644
--- a/components/sourceregistry.cpp
+++ b/components/sourceregistry.cpp
@@ -228,14 +228,33 @@ struct SourceRegistryPrivate
     void registerSingleRunnerSources()
     {
         KPluginInfo::List list = Plasma::PluginLoader::pluginLoader()->listRunnerInfo();
+
+        // FIXME: SC 4.13 replaced Nepomuk with Baloo for desktop search. Modifications
+        // to this logic skip registering the "nepomuksearch" runner when "baloosearch"
+        // is found and alias the latter to the former in the source registry to keep
+        // existing config files working. This can be dropped again once we depend on a
+        // SC version guaranteed to have Baloo around.
+        bool gotBaloo = false;
+
+        Q_FOREACH(const KPluginInfo &info, list) {
+            if (info.pluginName() == "baloosearch") {
+                gotBaloo = true;
+            }
+        }
+
         Q_FOREACH(const KPluginInfo &info, list) {
-            if (!info.property("X-Plasma-AdvertiseSingleRunnerQueryMode").toBool()) {
+            if (!info.property("X-Plasma-AdvertiseSingleRunnerQueryMode").toBool()
+                || (gotBaloo && info.pluginName() == "nepomuksearch")) {
                 continue;
             }
             QString runnerId = info.pluginName();
             SingleRunnerSource *source = new SingleRunnerSource(runnerId, q);
             QString name = i18n("Runner: %1", info.name());
             registerSource("SingleRunner/" + runnerId, source, name, info.comment());
+
+            if (runnerId == "baloosearch") {
+                registerSource("SingleRunner/nepomuksearch", source, name, info.comment());
+            }
         }
     }
 };
diff --git a/components/sources/runners/runnermodel.cpp b/components/sources/runners/runnermodel.cpp
index 1f02673..e2275d8 100644
--- a/components/sources/runners/runnermodel.cpp
+++ b/components/sources/runners/runnermodel.cpp
@@ -248,10 +248,11 @@ void RunnerModel::loadRunners()
 {
     Q_ASSERT(m_manager);
 
-    // FIXME: KDE 4.12 replaced Nepomuk with Baloo for desktop search. Homerun's
+    // FIXME: SC 4.13 replaced Nepomuk with Baloo for desktop search. Homerun's
     // default configs reference Nepomuk's "nepomuksearch" runner. The following
     // is a runtime approach to rewriting this to "baloosearch" when found. This
-    // keeps things working on <4.13 while enabling 4.13+ compatibility.
+    // keeps things working on <4.13 while enabling 4.13+ compatibility. It can
+    // be dropped once we depend on a SC version guaranteed to have Baloo around.
     KPluginInfo::List runners = m_manager->listRunnerInfo();
 
     foreach(const KPluginInfo &runner, runners) {

From 36d35e861fa110efb0be59c8489a323e1370a172 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Wed, 9 Apr 2014 04:54:26 +0200
Subject: [PATCH 2/2] Bump version, document release.

---
 CMakeLists.txt | 2 +-
 NEWS           | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e759079..e681c06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(homerun)
 SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 
 # Packaging
-set(HOMERUN_VERSION "1.2.2")
+set(HOMERUN_VERSION "1.2.3")
 
 # Dependencies
 find_package(KDE4 4.10.0 REQUIRED)
diff --git a/NEWS b/NEWS
index 4de05cb..ae832af 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+# 2014.04.09 - 1.2.3
+
+- This release enables compatibility with the revamped desktop search stack
+  in KDE SC 4.13. It is required for desktop search to work when Homerun is
+  used in KDE SC 4.13, both in the fullscreen version of Homerun (where
+  desktop search is exposed via the "KRunner" and "Runner: Desktop Search"
+  sources) and in Homerun Kicker. Existing user configurations continue to
+  work seamlessly, and versions older than 4.13 remain supported as well.
+
 # 2014.03.22 - 1.2.2
 
 - Fixed a bug causing icon setting changes from the configuration dialog of