DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #2740 from constantined/constantined

Browse Source 
UTF-8 support for JSON-RPC
This commit is contained in:
Gavin Andresen
2013-10-22 01:20:02 -07:00
parent 8435f7b8ee 2ecb7555a9
commit 125bdead3e
18 changed files with 702 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/rpcconsole.cpp
View File

@@ -159,7 +159,7 @@ void RPCExecutor::request(const QString &command)
else if (result.type() == json_spirit::str_type)
strPrint = result.get_str();
else
strPrint = write_string(result, true);
strPrint = write_string(result, json_spirit::pretty_print | json_spirit::raw_utf8);
emit reply(RPCConsole::CMD_REPLY, QString::fromStdString(strPrint));
}
@@ -173,7 +173,7 @@ void RPCExecutor::request(const QString &command)
}
catch(std::runtime_error &) // raised when converting to invalid type, i.e. missing code or message
{ // Show raw JSON object
emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false)));
emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), json_spirit::raw_utf8)));
}
}
catch (std::exception& e)