From bc28403a08c81d2c07c4582622d9c138ede24704 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Sun, 27 Mar 2016 17:03:57 +0900
Subject: [PATCH 1/2] Set config group.

BUG:357029
---
 desktoppackage/contents/updates/obsolete_kickoffrc.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/desktoppackage/contents/updates/obsolete_kickoffrc.js b/desktoppackage/contents/updates/obsolete_kickoffrc.js
index d92cae9..a3e6e9f 100644
--- a/desktoppackage/contents/updates/obsolete_kickoffrc.js
+++ b/desktoppackage/contents/updates/obsolete_kickoffrc.js
@@ -6,13 +6,13 @@ var favorites = kickoffConfig.readEntry("FavoriteURLs").split(',');
 kickoffConfig.group = "SystemApplications";
 var systemApplications = kickoffConfig.readEntry("DesktopFiles").split(',');
 
-if (systemApplications) {
+if (systemApplications.length) {
     // This used to be hardcoded in Kickoff C++ code; it's now the KConfigXT
     // default but needs to be added in when migrating from the rc file.
     systemApplications.unshift("systemsettings.desktop");
 }
 
-if (favorites || systemApplications) {
+if (favorites.length || systemApplications.length) {
     for (var i in panels()) {
         var panel = panels()[i];
 
@@ -20,11 +20,13 @@ if (favorites || systemApplications) {
             var widget = panel.widgetById(panel.widgetIds[j]);
 
             if (widget.type == "org.kde.plasma.kickoff") {
-                if (favorites) {
+                widget.currentConfigGroup = ["General"];
+
+                if (favorites.length) {
                     widget.writeConfig("favorites", favorites);
                 }
 
-                if (systemApplications) {
+                if (systemApplications.length) {
                     widget.writeConfig("systemApplications", systemApplications);
                 }
             }
@@ -38,11 +40,13 @@ if (favorites || systemApplications) {
             var widget = desktop.widgetById(desktop.widgetIds[j]);
 
             if (widget.type == "org.kde.plasma.kickoff") {
-                if (favorites) {
+                widget.currentConfigGroup = ["General"];
+
+                if (favorites.length) {
                     widget.writeConfig("favorites", favorites);
                 }
 
-                if (systemApplications) {
+                if (systemApplications.length) {
                     widget.writeConfig("systemApplications", systemApplications);
                 }
             }
-- 
1.9.3