File avoid-triggering-bug-340691.patch of Package plasma5-desktop.openSUSE_13.2_Update

From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Tue, 07 Apr 2015 11:44:29 +0000
Subject: Avoid triggering bug 340691
X-Git-Tag: v5.2.95
X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=b2fc8174d5733fe3b051f839944870b4f51b8c52
---
Avoid triggering bug 340691

With Kdelibs4Migration we know exactly which file to modify,
so it is both correct to use KConfig::SimpleConfig, and should help
avoiding triggering the mentioned bug.

A similar fix was applied for bug 343583.

REVIEW: 123281
---


--- a/kcms/icons/icons.cpp
+++ b/kcms/icons/icons.cpp
@@ -350,7 +350,7 @@
     }
 
     KSharedConfigPtr kglobalcfg = KSharedConfig::openConfig( "kdeglobals" );
-    KConfig kde4config(configFilePath);
+    KConfig kde4config(configFilePath, KConfig::SimpleConfig);
 
     KConfigGroup iconsGroup(kglobalcfg, "Icons");
     KConfigGroup kde4IconGroup(&kde4config, "Icons");

--- a/kcms/migrationlib/kdelibs4config.h
+++ b/kcms/migrationlib/kdelibs4config.h
@@ -25,7 +25,7 @@
 class Kdelibs4SharedConfig
 {
 public:
-    static KSharedConfig::Ptr openConfig(const QString &fileName, KConfig::OpenFlags mode=KConfig::FullConfig)
+    static KSharedConfig::Ptr openConfig(const QString &fileName, KConfig::OpenFlags mode=KConfig::SimpleConfig)
     {
         Kdelibs4Migration migration;
         QString configDirPath = migration.saveLocation("config");