aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-09 20:36:47 +0800
committerobscuren <geffobscura@gmail.com>2015-01-09 20:36:47 +0800
commitf9b0d1a8e738a207e6101b27b667ea390def9f69 (patch)
treedae3b1ac912c1bc719837b7c935a607e4ed77dfc
parentc9f566269b39780accfb7632b94dd7635be2022b (diff)
downloaddexon-f9b0d1a8e738a207e6101b27b667ea390def9f69.tar
dexon-f9b0d1a8e738a207e6101b27b667ea390def9f69.tar.gz
dexon-f9b0d1a8e738a207e6101b27b667ea390def9f69.tar.bz2
dexon-f9b0d1a8e738a207e6101b27b667ea390def9f69.tar.lz
dexon-f9b0d1a8e738a207e6101b27b667ea390def9f69.tar.xz
dexon-f9b0d1a8e738a207e6101b27b667ea390def9f69.tar.zst
dexon-f9b0d1a8e738a207e6101b27b667ea390def9f69.zip
Updated to new ethereum.js api
-rw-r--r--cmd/mist/assets/qml/browser.qml2
-rw-r--r--ui/qt/qwhisper/whisper.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/mist/assets/qml/browser.qml b/cmd/mist/assets/qml/browser.qml
index 2791560ac..f6d2d2d64 100644
--- a/cmd/mist/assets/qml/browser.qml
+++ b/cmd/mist/assets/qml/browser.qml
@@ -70,7 +70,7 @@ Rectangle {
}
function onShhMessage(message, id) {
- webview.postEvent("shhChanged", id, message)
+ webview.postEvent("shh_changed", id, message)
}
Item {
diff --git a/ui/qt/qwhisper/whisper.go b/ui/qt/qwhisper/whisper.go
index 62b68efaf..8b4628a1b 100644
--- a/ui/qt/qwhisper/whisper.go
+++ b/ui/qt/qwhisper/whisper.go
@@ -38,7 +38,7 @@ func (self *Whisper) SetView(view qml.Object) {
func (self *Whisper) Post(payload []string, to, from string, topics []string, priority, ttl uint32) {
var data []byte
for _, d := range payload {
- data = append(data, ethutil.Hex2Bytes(d)...)
+ data = append(data, fromHex(d)...)
}
msg := whisper.NewMessage(data)