dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3127 from jgarzik/smells-like-json-spirit

Browse Source 
Revert recent json-spirit changes
This commit is contained in:
Jeff Garzik
2013-10-22 07:25:54 -07:00
parent b3dd90c122 406b1f05f6
commit fcb9f26466
18 changed files with 404 additions and 703 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, json_spirit::pretty_print | json_spirit::raw_utf8);
strPrint = write_string(result, true);
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), json_spirit::raw_utf8)));
emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false)));
}
}
catch (std::exception& e)