diff options
| author | zelig <viktor.tron@gmail.com> | 2014-07-15 01:32:54 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-07-15 01:32:54 +0800 |
| commit | 353ecbb7d78d9669c42545f152f291f869b39c02 (patch) | |
| tree | f3cbb4ad253708b55001d658737578d9713dca52 /ethereal/ext_app.go | |
| parent | 6b296d907b848e2a3dbc78ea5c04c3c3d719d9bd (diff) | |
| parent | e53acdc2ac45fa8953afc3392ed81653d6f26326 (diff) | |
| download | dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.gz dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.bz2 dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.lz dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.xz dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.zst dexon-353ecbb7d78d9669c42545f152f291f869b39c02.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/ethutil-refactor
Diffstat (limited to 'ethereal/ext_app.go')
| -rw-r--r-- | ethereal/ext_app.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ethereal/ext_app.go b/ethereal/ext_app.go index c02f5ccb3..17c342a1b 100644 --- a/ethereal/ext_app.go +++ b/ethereal/ext_app.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethpub" - "github.com/ethereum/eth-go/ethreact" "github.com/ethereum/eth-go/ethutil" "github.com/go-qml/qml" ) @@ -25,8 +24,8 @@ type AppContainer interface { type ExtApplication struct { *ethpub.PEthereum - blockChan chan ethreact.Event - changeChan chan ethreact.Event + blockChan chan ethutil.React + changeChan chan ethutil.React quitChan chan bool watcherQuitChan chan bool @@ -38,8 +37,8 @@ type ExtApplication struct { func NewExtApplication(container AppContainer, lib *UiLib) *ExtApplication { app := &ExtApplication{ ethpub.NewPEthereum(lib.eth), - make(chan ethreact.Event), - make(chan ethreact.Event), + make(chan ethutil.React, 1), + make(chan ethutil.React, 1), make(chan bool), make(chan bool), container, |