From: Peter Penz <peter.penz19@gmail.com>
Date: Sun, 3 Aug 2008 10:49:07 +0000 (+0000)
Subject: fixed issue that the "[ ] Show 'Delete' command" for the context menu did not work
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/9ff8e510343443da773994204e5040932214a142?ds=inline

fixed issue that the "[ ] Show 'Delete' command" for the context menu did not work

@David: the same issue occurs in Konqueror (settings/konq/behavior.cpp) - may I apply the fix there too?

BUG: 167773
CCMAIL: faure@kde.org

svn path=/trunk/KDE/kdebase/apps/; revision=841473
---

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index c4b479f66..dc891a074 100644
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -106,10 +106,9 @@ void GeneralSettingsPage::applySettings()
     confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
     confirmationGroup.sync();
 
-    KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
-    KConfigGroup globalGroup(globalConfig, "KDE");
-    globalGroup.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked());
-    globalGroup.sync();
+    KConfigGroup kdeConfig(KGlobal::config(), "KDE");
+    kdeConfig.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked());
+    kdeConfig.sync();
 
     settings->setShowCopyMoveMenu(m_showCopyMoveMenu->isChecked());
     settings->setBrowseThroughArchives(m_browseThroughArchives->isChecked());
@@ -133,9 +132,8 @@ void GeneralSettingsPage::loadSettings()
     m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", false));
     m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", true));
 
-    KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
-    KConfigGroup globalGroup(globalConfig, "KDE");
-    m_showDeleteCommand->setChecked(globalGroup.readEntry("ShowDeleteCommand", false));
+    const KConfigGroup kdeConfig(KGlobal::config(), "KDE");
+    m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand", false));
 
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_showCopyMoveMenu->setChecked(settings->showCopyMoveMenu());