From e32f7baa0d5d949a84a3b29c57220f837eae356a Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 22 Dec 2014 14:59:52 +0100
Subject: [PATCH] Concat and pad data

---
 cmd/mist/assets/qml/browser.qml       | 5 +++--
 cmd/mist/assets/qml/views/whisper.qml | 2 +-
 ui/qt/qwhisper/whisper.go             | 9 +++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/cmd/mist/assets/qml/browser.qml b/cmd/mist/assets/qml/browser.qml
index 867260507..1425f60c0 100644
--- a/cmd/mist/assets/qml/browser.qml
+++ b/cmd/mist/assets/qml/browser.qml
@@ -59,7 +59,8 @@ Rectangle {
     }
 
     Component.onCompleted: {
-        webview.url = "http://etherian.io"
+        //webview.url = "http://etherian.io"
+	webview.url = "file:///Users/jeffrey/test.html"
     }
 
     signal messages(var messages, int id);
@@ -350,7 +351,7 @@ Rectangle {
 			for(var i = 0; i < fields.length; i++) {
 				params[fields[i]] = params[fields[i]] || "";
 			}
-			if(typeof params.payload === "object") { params.payload = params.payload.join(""); }
+			if(typeof params.payload !== "object") { params.payload = [params.payload]; } //params.payload = params.payload.join(""); }
 			params.topics = params.topics || [];
 			params.priority = params.priority || 1000;
 			params.ttl = params.ttl || 100;
diff --git a/cmd/mist/assets/qml/views/whisper.qml b/cmd/mist/assets/qml/views/whisper.qml
index ffe391666..56c4f1b07 100644
--- a/cmd/mist/assets/qml/views/whisper.qml
+++ b/cmd/mist/assets/qml/views/whisper.qml
@@ -52,7 +52,7 @@ Rectangle {
 		Button {
 			text: "Send"
 			onClicked: {
-				shh.post(eth.toHex(data.text), "", identity, topics.text.split(","), 500, 50)
+				shh.post([eth.toHex(data.text)], "", identity, topics.text.split(","), 500, 50)
 			}
 		}
 	}
diff --git a/ui/qt/qwhisper/whisper.go b/ui/qt/qwhisper/whisper.go
index 62676daf5..0627acd29 100644
--- a/ui/qt/qwhisper/whisper.go
+++ b/ui/qt/qwhisper/whisper.go
@@ -33,8 +33,13 @@ func (self *Whisper) SetView(view qml.Object) {
 	self.view = view
 }
 
-func (self *Whisper) Post(data, to, from string, topics []string, priority, ttl uint32) {
-	msg := whisper.NewMessage(fromHex(data))
+func (self *Whisper) Post(payload []string, to, from string, topics []string, priority, ttl uint32) {
+	var data []byte
+	for _, d := range payload {
+		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)),