From 42439cd482987f17a0202c57beb9622bba1f8490 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Thu, 1 Nov 2007 22:09:48 +0000 Subject: [PATCH] fixed issue that the "Ask for confirmation when moving files or folders to trash"-setting is ignored CCMAIL: ereslibre@kde.org svn path=/trunk/KDE/kdebase/apps/; revision=731813 --- src/generalsettingspage.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp index 5584350b3e..f856de1b17 100644 --- a/src/generalsettingspage.cpp +++ b/src/generalsettingspage.cpp @@ -137,7 +137,8 @@ void GeneralSettingsPage::applySettings() settings->setEditableUrl(m_editableUrl->isChecked()); settings->setFilterBar(m_filterBar->isChecked()); - KConfigGroup trashConfig(KGlobal::config(), "Trash"); + KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals); + KConfigGroup trashConfig(konqConfig, "Trash"); trashConfig.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked()); trashConfig.writeEntry("ConfirmDelete", m_confirmDelete->isChecked()); trashConfig.sync(); @@ -185,7 +186,8 @@ void GeneralSettingsPage::loadSettings() m_editableUrl->setChecked(settings->editableUrl()); m_filterBar->setChecked(settings->filterBar()); - const KConfigGroup trashConfig(KGlobal::config(), "Trash"); + KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals); + const KConfigGroup trashConfig(konqConfig, "Trash"); m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false)); m_confirmDelete->setChecked(trashConfig.readEntry("ConfirmDelete", true));