diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 05:42:46 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 05:42:46 +0800 |
| commit | 6bd1f6cc49acd459e61559e5af515da2db2481e5 (patch) | |
| tree | 3e4f7a51ca8e3cb03d24fbe1898578d88fd7456c /cmd/mist/gui.go | |
| parent | bb12dbe233db2e064715b329b7ba987c76ba3bfa (diff) | |
| parent | b0b0939879b9fb8453ec1c8fa2ceb522e56df3bc (diff) | |
| download | go-tangerine-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar go-tangerine-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar.gz go-tangerine-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar.bz2 go-tangerine-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar.lz go-tangerine-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar.xz go-tangerine-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar.zst go-tangerine-6bd1f6cc49acd459e61559e5af515da2db2481e5.zip | |
Merge remote-tracking branch 'origin' into rpcargs
Conflicts:
rpc/args.go
Diffstat (limited to 'cmd/mist/gui.go')
| -rw-r--r-- | cmd/mist/gui.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index 08f02f833..d37d6f81b 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -25,6 +25,7 @@ import "C" import ( "encoding/json" "fmt" + "io/ioutil" "math/big" "path" "runtime" @@ -91,8 +92,8 @@ func NewWindow(ethereum *eth.Ethereum) *Gui { plugins: make(map[string]plugin), serviceEvents: make(chan ServEv, 1), } - data, _ := common.ReadAllFile(path.Join(ethereum.DataDir, "plugins.json")) - json.Unmarshal([]byte(data), &gui.plugins) + data, _ := ioutil.ReadFile(path.Join(ethereum.DataDir, "plugins.json")) + json.Unmarshal(data, &gui.plugins) return gui } |