From d13504b5a741e03f9854814df33405700ed0e087 Mon Sep 17 00:00:00 2001 From: Dawit Alemayehu Date: Wed, 18 Jan 2012 13:30:54 -0500 Subject: [PATCH] When populating the "Show Remote Encoding" menu, put the check mark besides the correct saved remote encoding charset. BUG: 186289 FIXED-IN: 4.8.0 REVIEW: 103730 (cherry picked from commit 8f231bd08134f7b1870a9c1747429c1b05174d62) --- src/views/dolphinremoteencoding.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index 8644f5cc2d..375b3fd46a 100644 --- a/src/views/dolphinremoteencoding.cpp +++ b/src/views/dolphinremoteencoding.cpp @@ -132,14 +132,14 @@ void DolphinRemoteEncoding::updateMenu() m_menu->menu()->actions().at(i)->setChecked(false); } - QString charset = KIO::SlaveConfig::self()->configData(m_currentURL.protocol(), - m_currentURL.host(), DATA_KEY); + QString charset = KGlobal::charsets()->descriptionForEncoding(KIO::SlaveConfig::self()->configData(m_currentURL.protocol(), + m_currentURL.host(), DATA_KEY)); if (!charset.isEmpty()) { int id = 0; bool isFound = false; for (int i = 0; i < m_encodingDescriptions.size(); i++) { - if (m_encodingDescriptions.at(i).contains(charset)) { + if (m_encodingDescriptions.at(i) == charset) { isFound = true; id = i; break;