diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-16 21:43:30 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-16 21:43:30 +0800 |
| commit | 3068e2688d88912ec33f3d80fd0fe26c4e897dcd (patch) | |
| tree | ee32ccd17faf650f3e933e9a2d8b4ab52f0d7746 /cmd/mist/html_container.go | |
| parent | 1878630b591b039fadb6f88e15340d04f4af3ed1 (diff) | |
| parent | 68f6ddc5aaa7ff29d09c1519ccd38d9cf16c0f75 (diff) | |
| download | go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.gz go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.bz2 go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.lz go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.xz go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.zst go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.zip | |
merge conflicts
Diffstat (limited to 'cmd/mist/html_container.go')
| -rw-r--r-- | cmd/mist/html_container.go | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/cmd/mist/html_container.go b/cmd/mist/html_container.go index 0909a6abd..e4ea57b9b 100644 --- a/cmd/mist/html_container.go +++ b/cmd/mist/html_container.go @@ -31,7 +31,6 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethutil" - "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/xeth" "github.com/howeyc/fsnotify" "github.com/obscuren/qml" @@ -144,19 +143,6 @@ func (app *HtmlApplication) NewBlock(block *types.Block) { app.webView.Call("onNewBlockCb", b) } -func (self *HtmlApplication) Messages(messages state.Messages, id string) { - /* TODO remove me - var msgs []javascript.JSMessage - for _, m := range messages { - msgs = append(msgs, javascript.NewJSMessage(m)) - } - - b, _ := json.Marshal(msgs) - - self.webView.Call("onWatchedCb", string(b), id) - */ -} - func (app *HtmlApplication) Destroy() { app.engine.Destroy() } |