diff options
| author | Dawit Alemayehu <[email protected]> | 2012-01-18 13:30:54 -0500 |
|---|---|---|
| committer | Dawit Alemayehu <[email protected]> | 2012-01-18 18:05:15 -0500 |
| commit | d13504b5a741e03f9854814df33405700ed0e087 (patch) | |
| tree | 385b2d0869bb54fb2618f324aaeb8d53a1f9a556 /src/views/dolphinremoteencoding.cpp | |
| parent | 0b0b2cba93448e1da2e4cde4fb3007c480baad23 (diff) | |
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)
Diffstat (limited to 'src/views/dolphinremoteencoding.cpp')
| -rw-r--r-- | src/views/dolphinremoteencoding.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index 8644f5cc2..375b3fd46 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; |