diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-17 19:29:10 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-17 19:29:10 +0800 |
| commit | abb9b7f46ff3b2ef0bb4f2e95f029591688768c4 (patch) | |
| tree | c4088c788b3e86935a2b8fd2fbe157340476f091 /ui | |
| parent | fbd5e4d5afeaff6c250a3a953b18476cdb4b86ae (diff) | |
| parent | c934222a8089b19587242a3b0bc71ea0aec1d5ef (diff) | |
| download | dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.gz dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.bz2 dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.lz dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.xz dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.zst dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.zip | |
Merge branch 'develop' into ui
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/filter.go | 2 | ||||
| -rw-r--r-- | ui/qt/filter.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/filter.go b/ui/filter.go index 8f298a40c..da2ea0edb 100644 --- a/ui/filter.go +++ b/ui/filter.go @@ -15,7 +15,7 @@ func fromHex(s string) []byte { return nil } -func NewFilterFromMap(object map[string]interface{}, eth core.EthManager) *core.Filter { +func NewFilterFromMap(object map[string]interface{}, eth core.Backend) *core.Filter { filter := core.NewFilter(eth) if object["earliest"] != nil { diff --git a/ui/qt/filter.go b/ui/qt/filter.go index bd3ad0303..48e8a7fae 100644 --- a/ui/qt/filter.go +++ b/ui/qt/filter.go @@ -6,7 +6,7 @@ import ( "github.com/obscuren/qml" ) -func NewFilterFromMap(object map[string]interface{}, eth core.EthManager) *core.Filter { +func NewFilterFromMap(object map[string]interface{}, eth core.Backend) *core.Filter { filter := ui.NewFilterFromMap(object, eth) if object["topics"] != nil { |