diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-11 18:40:12 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-11 18:40:12 +0800 |
| commit | cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007 (patch) | |
| tree | ab28c518bd1b78f6b8ac8b241951ad161cb268a9 /cmd/mist/ext_app.go | |
| parent | 21fd31dad8bc6e0291ca405314b516670333c707 (diff) | |
| parent | c6af5f0a275608ea6c797ef826e6090885f24eac (diff) | |
| download | go-tangerine-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar go-tangerine-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.gz go-tangerine-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.bz2 go-tangerine-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.lz go-tangerine-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.xz go-tangerine-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.zst go-tangerine-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.zip | |
Merge branch 'develop' into jsonrpc
Conflicts:
rpc/ws/server.go
Diffstat (limited to 'cmd/mist/ext_app.go')
| -rw-r--r-- | cmd/mist/ext_app.go | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/cmd/mist/ext_app.go b/cmd/mist/ext_app.go index bc856cd72..20ec52e60 100644 --- a/cmd/mist/ext_app.go +++ b/cmd/mist/ext_app.go @@ -21,16 +21,13 @@ package main import ( - "encoding/json" - "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/javascript" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/ui/qt" "github.com/ethereum/go-ethereum/xeth" - "gopkg.in/qml.v1" + "github.com/obscuren/qml" ) type AppContainer interface { @@ -113,13 +110,15 @@ func (app *ExtApplication) mainLoop() { case core.NewBlockEvent: app.container.NewBlock(ev.Block) - case state.Messages: - for id, filter := range app.filters { - msgs := filter.FilterMessages(ev) - if len(msgs) > 0 { - app.container.Messages(msgs, id) + /* TODO remove + case state.Messages: + for id, filter := range app.filters { + msgs := filter.FilterMessages(ev) + if len(msgs) > 0 { + app.container.Messages(msgs, id) + } } - } + */ } } } @@ -129,6 +128,7 @@ func (self *ExtApplication) Watch(filterOptions map[string]interface{}, identifi } func (self *ExtApplication) GetMessages(object map[string]interface{}) string { + /* TODO remove me filter := qt.NewFilterFromMap(object, self.eth) messages := filter.Find() @@ -143,4 +143,6 @@ func (self *ExtApplication) GetMessages(object map[string]interface{}) string { } return string(b) + */ + return "" } |