diff options
| author | Ethan Buchman <ethan@coinculture.info> | 2015-02-18 08:25:18 +0800 |
|---|---|---|
| committer | Ethan Buchman <ethan@coinculture.info> | 2015-02-18 08:25:18 +0800 |
| commit | 2ba65f4fbaea49c1e0d99959b0331e09b153f931 (patch) | |
| tree | add8cabb05cd7fbf0ba4b4bbaf9460dacfc2082d /ui/qt/qwhisper/whisper.go | |
| parent | 2da367a2bee84d74d1bb0ea1b42d4c22fae486dd (diff) | |
| parent | 60318c96d03bcaaf731802b1080a3d87cb482124 (diff) | |
| download | dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.gz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.bz2 dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.lz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.xz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.zst dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.zip | |
Merge branch 'develop' of https://github.com/ethereum/go-ethereum into develop
Diffstat (limited to 'ui/qt/qwhisper/whisper.go')
| -rw-r--r-- | ui/qt/qwhisper/whisper.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/qt/qwhisper/whisper.go b/ui/qt/qwhisper/whisper.go index 644c147b7..2bc455b0b 100644 --- a/ui/qt/qwhisper/whisper.go +++ b/ui/qt/qwhisper/whisper.go @@ -1,3 +1,4 @@ +// QWhisper package. This package is temporarily on hold until QML DApp dev will reemerge. package qwhisper import ( @@ -7,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/whisper" - "gopkg.in/qml.v1" + "github.com/obscuren/qml" ) var qlogger = logger.NewLogger("QSHH") @@ -105,7 +106,7 @@ func (self *Whisper) Messages(id int) (messages *ethutil.List) { func filterFromMap(opts map[string]interface{}) (f whisper.Filter) { if to, ok := opts["to"].(string); ok { - f.To = crypto.ToECDSA(fromHex(to)) + f.To = crypto.ToECDSAPub(fromHex(to)) } if from, ok := opts["from"].(string); ok { f.From = crypto.ToECDSAPub(fromHex(from)) |