7 files changed, 95 insertions, 42 deletions
diff --git a/ui/qt/filter.go b/ui/qt/filter.go
index c68936401..bd3ad0303 100644
--- a/ui/qt/filter.go
+++ b/ui/qt/filter.go
@@ -1,37 +1,29 @@
 package qt
 
 import (
-	"fmt"
-
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/ui"
-	"gopkg.in/qml.v1"
+	"github.com/obscuren/qml"
 )
 
 func NewFilterFromMap(object map[string]interface{}, eth core.EthManager) *core.Filter {
 	filter := ui.NewFilterFromMap(object, eth)
 
-	if object["altered"] != nil {
-		filter.Altered = makeAltered(object["altered"])
+	if object["topics"] != nil {
+		filter.SetTopics(makeTopics(object["topics"]))
 	}
 
 	return filter
 }
 
-func makeAltered(v interface{}) (d []core.AccountChange) {
+func makeTopics(v interface{}) (d [][]byte) {
 	if qList, ok := v.(*qml.List); ok {
-		var s []interface{}
+		var s []string
 		qList.Convert(&s)
 
-		fmt.Println(s)
-
-		d = makeAltered(s)
-	} else if qMap, ok := v.(*qml.Map); ok {
-		var m map[string]interface{}
-		qMap.Convert(&m)
-		fmt.Println(m)
-
-		d = makeAltered(m)
+		d = ui.MakeTopics(s)
+	} else if str, ok := v.(string); ok {
+		d = ui.MakeTopics(str)
 	}
 
 	return
diff --git a/ui/qt/qwhisper/message.go b/ui/qt/qwhisper/message.go
index c87647399..26e72ac93 100644
--- a/ui/qt/qwhisper/message.go
+++ b/ui/qt/qwhisper/message.go
@@ -8,16 +8,16 @@ import (
 
 type Message struct {
 	ref     *whisper.Message
-	Flags   int32
-	Payload string
-	From    string
+	Flags   int32  `json:"flags"`
+	Payload string `json:"payload"`
+	From    string `json:"from"`
 }
 
 func ToQMessage(msg *whisper.Message) *Message {
 	return &Message{
 		ref:     msg,
 		Flags:   int32(msg.Flags),
-		Payload: ethutil.Bytes2Hex(msg.Payload),
-		From:    ethutil.Bytes2Hex(crypto.FromECDSAPub(msg.Recover())),
+		Payload: "0x" + ethutil.Bytes2Hex(msg.Payload),
+		From:    "0x" + ethutil.Bytes2Hex(crypto.FromECDSAPub(msg.Recover())),
 	}
 }
diff --git a/ui/qt/qwhisper/whisper.go b/ui/qt/qwhisper/whisper.go
index 0627acd29..2bc455b0b 100644
--- a/ui/qt/qwhisper/whisper.go
+++ b/ui/qt/qwhisper/whisper.go
@@ -1,15 +1,18 @@
+// QWhisper package. This package is temporarily on hold until QML DApp dev will reemerge.
 package qwhisper
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/ethereum/go-ethereum/crypto"
 	"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")
+
 func fromHex(s string) []byte {
 	if len(s) > 1 {
 		return ethutil.Hex2Bytes(s[2:])
@@ -39,32 +42,41 @@ func (self *Whisper) Post(payload []string, to, from string, topics []string, pr
 		data = append(data, fromHex(d)...)
 	}
 
-	msg := whisper.NewMessage(data)
-	envelope, err := msg.Seal(time.Duration(priority*100000), whisper.Opts{
-		Ttl:    time.Duration(ttl),
-		To:     crypto.ToECDSAPub(fromHex(to)),
-		From:   crypto.ToECDSA(fromHex(from)),
-		Topics: whisper.TopicsFromString(topics...),
-	})
-	if err != nil {
-		fmt.Println(err)
-		// handle error
-		return
-	}
+	pk := crypto.ToECDSAPub(fromHex(from))
+	if key := self.Whisper.GetIdentity(pk); key != nil {
+		msg := whisper.NewMessage(data)
+		envelope, err := msg.Seal(time.Duration(priority*100000), whisper.Opts{
+			Ttl:    time.Duration(ttl) * time.Second,
+			To:     crypto.ToECDSAPub(fromHex(to)),
+			From:   key,
+			Topics: whisper.TopicsFromString(topics...),
+		})
+
+		if err != nil {
+			qlogger.Infoln(err)
+			// handle error
+			return
+		}
 
-	if err := self.Whisper.Send(envelope); err != nil {
-		fmt.Println(err)
-		// handle error
-		return
+		if err := self.Whisper.Send(envelope); err != nil {
+			qlogger.Infoln(err)
+			// handle error
+			return
+		}
+	} else {
+		qlogger.Infoln("unmatched pub / priv for seal")
 	}
+
 }
 
 func (self *Whisper) NewIdentity() string {
-	return toHex(self.Whisper.NewIdentity().D.Bytes())
+	key := self.Whisper.NewIdentity()
+
+	return toHex(crypto.FromECDSAPub(&key.PublicKey))
 }
 
 func (self *Whisper) HasIdentity(key string) bool {
-	return self.Whisper.HasIdentity(crypto.ToECDSA(fromHex(key)))
+	return self.Whisper.HasIdentity(crypto.ToECDSAPub(fromHex(key)))
 }
 
 func (self *Whisper) Watch(opts map[string]interface{}, view *qml.Common) int {
@@ -82,9 +94,19 @@ func (self *Whisper) Watch(opts map[string]interface{}, view *qml.Common) int {
 	return i
 }
 
+func (self *Whisper) Messages(id int) (messages *ethutil.List) {
+	msgs := self.Whisper.Messages(id)
+	messages = ethutil.EmptyList()
+	for _, message := range msgs {
+		messages.Append(ToQMessage(message))
+	}
+
+	return
+}
+
 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))
diff --git a/ui/qt/webengine/all.cpp b/ui/qt/webengine/all.cpp
new file mode 100644
index 000000000..3b7c2f7b8
--- /dev/null
+++ b/ui/qt/webengine/all.cpp
@@ -0,0 +1 @@
+#include "cpp/webengine.cpp"
diff --git a/ui/qt/webengine/cpp/webengine.cpp b/ui/qt/webengine/cpp/webengine.cpp
new file mode 100644
index 000000000..118b451ef
--- /dev/null
+++ b/ui/qt/webengine/cpp/webengine.cpp
@@ -0,0 +1,6 @@
+#include <QtWebEngine>
+#include "webengine.h"
+
+void webengineInitialize() {
+	QtWebEngine::initialize();
+}
diff --git a/ui/qt/webengine/cpp/webengine.h b/ui/qt/webengine/cpp/webengine.h
new file mode 100644
index 000000000..9c3b13bfa
--- /dev/null
+++ b/ui/qt/webengine/cpp/webengine.h
@@ -0,0 +1,14 @@
+#ifndef WEBENGINE_H
+#define WEBENGINE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void webengineInitialize();
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // WEBENGINE_H
diff --git a/ui/qt/webengine/webengine.go b/ui/qt/webengine/webengine.go
new file mode 100644
index 000000000..600dbb6cb
--- /dev/null
+++ b/ui/qt/webengine/webengine.go
@@ -0,0 +1,18 @@
+package webengine
+
+// #cgo CPPFLAGS: -I./
+// #cgo CXXFLAGS: -std=c++0x -pedantic-errors -Wall -fno-strict-aliasing
+// #cgo LDFLAGS: -lstdc++
+// #cgo pkg-config: Qt5WebEngine
+//
+// #include "cpp/webengine.h"
+import "C"
+
+import "github.com/obscuren/qml"
+
+// Initializes the WebEngine extension.
+func Initialize() {
+	qml.RunMain(func() {
+		C.webengineInitialize()
+	})
+}