Updated QWhisper

* changed api
* general whisper debug interface

1 files changed, 6 insertions, 11 deletions

diff --git a/ui/qt/qwhisper/whisper.go b/ui/qt/qwhisper/whisper.go
index 8f05c0695..6fb00cdac 100644
--- a/ui/qt/qwhisper/whisper.go
+++ b/ui/qt/qwhisper/whisper.go
@@ -3,7 +3,6 @@ package qwhisper
 import (
 	"fmt"
 	"time"
-	"unsafe"
 
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethutil"
@@ -19,13 +18,6 @@ func fromHex(s string) []byte {
 }
 func toHex(b []byte) string { return "0x" + ethutil.Bytes2Hex(b) }
 
-type Watch struct {
-}
-
-func (self *Watch) Arrived(v unsafe.Pointer) {
-	fmt.Println(v)
-}
-
 type Whisper struct {
 	*whisper.Whisper
 	view qml.Object
@@ -70,15 +62,18 @@ func (self *Whisper) HasIdentity(key string) bool {
 	return self.Whisper.HasIdentity(crypto.ToECDSA(fromHex(key)))
 }
 
-func (self *Whisper) Watch(opts map[string]interface{}) *Watch {
+func (self *Whisper) Watch(opts map[string]interface{}, view *qml.Common) int {
 	filter := filterFromMap(opts)
 	filter.Fn = func(msg *whisper.Message) {
-		fmt.Println(msg)
+		if view != nil {
+			view.Call("onMessage", ToQMessage(msg))
+		}
 	}
+
 	i := self.Whisper.Watch(filter)
 	self.watches[i] = &Watch{}
 
-	return self.watches[i]
+	return i
 }
 
 func filterFromMap(opts map[string]interface{}) (f whisper.Filter) {