diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-28 17:17:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-28 17:17:41 +0800 |
| commit | 99027c79fe7406919d654ab482d8ad37fcf098ce (patch) | |
| tree | 9f6625b30b9d63d28f7e86c69d31991daac4fbf7 /ui | |
| parent | bac455c0117f7095ee9c60ac75a249ddd66c2660 (diff) | |
| parent | a05c420371aa56657b86ba3dce6ebb087adb708d (diff) | |
| download | dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.tar dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.gz dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.bz2 dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.lz dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.xz dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.zst dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
rpc/api.go
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/qwhisper/whisper.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/qwhisper/whisper.go b/ui/qt/qwhisper/whisper.go index 50b0626f5..4ab6d2e5a 100644 --- a/ui/qt/qwhisper/whisper.go +++ b/ui/qt/qwhisper/whisper.go @@ -106,7 +106,7 @@ func filterFromMap(opts map[string]interface{}) (f whisper.Filter) { if topicList, ok := opts["topics"].(*qml.List); ok { var topics []string topicList.Convert(&topics) - f.Topics = whisper.NewTopicsFromStrings(topics...) + f.Topics = whisper.NewFilterTopicsFromStringsFlat(topics...) } return |