diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-02 19:35:44 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-02 19:35:44 +0800 |
| commit | 60f9966cd8f991967882dd61e602822a95681d85 (patch) | |
| tree | 037e8d0a7a9a546b10ddef65be17a0328b62d551 /ethereal/ui/html_container.go | |
| parent | 3424bf17ca791b97ea512bef5290d1a52c1758af (diff) | |
| parent | f1da6f0564696f4fb5a6c04d1b9e24ed12432d63 (diff) | |
| download | go-tangerine-60f9966cd8f991967882dd61e602822a95681d85.tar go-tangerine-60f9966cd8f991967882dd61e602822a95681d85.tar.gz go-tangerine-60f9966cd8f991967882dd61e602822a95681d85.tar.bz2 go-tangerine-60f9966cd8f991967882dd61e602822a95681d85.tar.lz go-tangerine-60f9966cd8f991967882dd61e602822a95681d85.tar.xz go-tangerine-60f9966cd8f991967882dd61e602822a95681d85.tar.zst go-tangerine-60f9966cd8f991967882dd61e602822a95681d85.zip | |
Merge branch 'develop' into feature/rpc
Diffstat (limited to 'ethereal/ui/html_container.go')
| -rw-r--r-- | ethereal/ui/html_container.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ethereal/ui/html_container.go b/ethereal/ui/html_container.go index 8e3ef0fc7..16cc531f2 100644 --- a/ethereal/ui/html_container.go +++ b/ethereal/ui/html_container.go @@ -4,6 +4,7 @@ import ( "errors" "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethutil" + "github.com/ethereum/go-ethereum/utils" "github.com/go-qml/qml" "math/big" "path/filepath" @@ -56,12 +57,12 @@ func (app *HtmlApplication) Window() *qml.Window { } func (app *HtmlApplication) NewBlock(block *ethchain.Block) { - b := &QBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())} + b := &utils.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())} app.webView.Call("onNewBlockCb", b) } func (app *HtmlApplication) ObjectChanged(stateObject *ethchain.StateObject) { - app.webView.Call("onObjectChangeCb", NewQStateObject(stateObject)) + app.webView.Call("onObjectChangeCb", utils.NewPStateObject(stateObject)) } func (app *HtmlApplication) StorageChanged(stateObject *ethchain.StateObject, addr []byte, value *big.Int) { |