diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-23 21:29:01 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-23 21:29:01 +0800 |
| commit | 7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c (patch) | |
| tree | a6d55756ec833b3651e5805726813a7ef5af3399 /cmd/mist/ui_lib.go | |
| parent | 215780ab562b940bfc653c16bf84f812ef062821 (diff) | |
| parent | d792e95c214c8352e6b23b798101e90844eaa7a3 (diff) | |
| download | go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.gz go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.bz2 go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.lz go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.xz go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.zst go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.zip | |
Merge branch 'develop' into jsonrpc
Diffstat (limited to 'cmd/mist/ui_lib.go')
| -rw-r--r-- | cmd/mist/ui_lib.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index c88c4dab6..e0321f6dd 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -312,23 +312,19 @@ func (self *UiLib) ToAscii(data string) string { } /// Ethereum filter methods -func (self *UiLib) NewFilter(object map[string]interface{}) (id int) { +func (self *UiLib) NewFilter(object map[string]interface{}, view *qml.Common) (id int) { filter := qt.NewFilterFromMap(object, self.eth) filter.MessageCallback = func(messages state.Messages) { - self.win.Root().Call("invokeFilterCallback", xeth.ToJSMessages(messages), id) + view.Call("messages", xeth.ToJSMessages(messages), id) } id = self.filterManager.InstallFilter(filter) return id } -func (self *UiLib) NewFilterString(typ string) (id int) { +func (self *UiLib) NewFilterString(typ string, view *qml.Common) (id int) { filter := core.NewFilter(self.eth) filter.BlockCallback = func(block *types.Block) { - if self.win != nil && self.win.Root() != nil { - self.win.Root().Call("invokeFilterCallback", "{}", id) - } else { - fmt.Println("QML is lagging") - } + view.Call("messages", "{}", id) } id = self.filterManager.InstallFilter(filter) return id |