Commit e824021d authored by Dawit Alemayehu's avatar Dawit Alemayehu
Browse files

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 8f231bd0)
parent 5329fb57
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment