diff options
| author | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-01-23 22:37:37 +0800 |
|---|---|---|
| committer | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-01-23 22:37:37 +0800 |
| commit | 3aa0410f6ecaa6a44c8e7fa0164cc3209eb6cb8e (patch) | |
| tree | bebbffe2cbbd78f2bb01805a31685cfbfdaaea70 /cmd/mist/ui_lib.go | |
| parent | d5f38f5690caeb30794e62d4a1b2683a6107cfbc (diff) | |
| parent | d792e95c214c8352e6b23b798101e90844eaa7a3 (diff) | |
| download | dexon-3aa0410f6ecaa6a44c8e7fa0164cc3209eb6cb8e.tar dexon-3aa0410f6ecaa6a44c8e7fa0164cc3209eb6cb8e.tar.gz dexon-3aa0410f6ecaa6a44c8e7fa0164cc3209eb6cb8e.tar.bz2 dexon-3aa0410f6ecaa6a44c8e7fa0164cc3209eb6cb8e.tar.lz dexon-3aa0410f6ecaa6a44c8e7fa0164cc3209eb6cb8e.tar.xz dexon-3aa0410f6ecaa6a44c8e7fa0164cc3209eb6cb8e.tar.zst dexon-3aa0410f6ecaa6a44c8e7fa0164cc3209eb6cb8e.zip | |
Merge remote-tracking branch 'upstream/develop' into pr/evmjit
Diffstat (limited to 'cmd/mist/ui_lib.go')
| -rw-r--r-- | cmd/mist/ui_lib.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 596f8442a..e0321f6dd 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -316,20 +316,15 @@ func (self *UiLib) NewFilter(object map[string]interface{}, view *qml.Common) (i filter := qt.NewFilterFromMap(object, self.eth) filter.MessageCallback = func(messages state.Messages) { view.Call("messages", xeth.ToJSMessages(messages), id) - //self.win.Root().Call("invokeFilterCallback", 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 |