diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-29 01:36:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-29 01:36:41 +0800 |
| commit | 1c51e12c181fb781cafaf34fc8dd2cb07fd85df7 (patch) | |
| tree | 38465edc586ae8080018f37efa8657c7dfeab6af /cmd/mist/qml_container.go | |
| parent | 45e15f62f594d6f5191e60a54aead33602838e98 (diff) | |
| parent | 872b2497114209119becf2e8a4d4a5818e2084ee (diff) | |
| download | dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.gz dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.bz2 dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.lz dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.xz dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.zst dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.zip | |
Merge branch 'jsonrpc' into qt5.4
Diffstat (limited to 'cmd/mist/qml_container.go')
| -rw-r--r-- | cmd/mist/qml_container.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/mist/qml_container.go b/cmd/mist/qml_container.go index 10b0b1c49..9d76d8fe4 100644 --- a/cmd/mist/qml_container.go +++ b/cmd/mist/qml_container.go @@ -70,7 +70,7 @@ func (app *QmlApplication) NewWatcher(quitChan chan bool) { // Events func (app *QmlApplication) NewBlock(block *types.Block) { - pblock := &xeth.JSBlock{Number: int(block.NumberU64()), Hash: ethutil.Bytes2Hex(block.Hash())} + pblock := &xeth.Block{Number: int(block.NumberU64()), Hash: ethutil.Bytes2Hex(block.Hash())} app.win.Call("onNewBlockCb", pblock) } |