Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
JoelKatz
2012-07-17 03:10:55 -07:00
4 changed files with 12 additions and 2 deletions

View File

@@ -836,11 +836,17 @@ Json::Value STAmount::getJson(int) const
{
Json::Value elem(Json::objectValue);
elem["value"] = getText();
// This is a hack, many places don't specify a currency. STAmount is used just as a value.
if (!mIsNative)
{
elem["value"] = getText();
elem["currency"] = getCurrencyHuman();
}else
{
elem=getText();
}
return elem;
}

View File

@@ -1386,7 +1386,7 @@ Json::Value RPCServer::doSend(const Json::Value& params)
{
// Not enough native currency.
Log(lsINFO) << "doSend: Insufficent funds: src=" << saSrcAmount.getText() << " dst=" << saDstAmount.getText();
Log(lsINFO) << "doSend: Insufficient funds: src=" << saSrcAmount.getText() << " dst=" << saDstAmount.getText();
return RPCError(rpcINSUF_FUNDS);
}