From f16810c48e7cb753844d6eea1a68361fc1539389 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 5 Jan 2015 17:12:52 +0100
Subject: [PATCH] added shh back in
---
cmd/mist/assets/qml/main.qml | 1 +
cmd/mist/gui.go | 2 +-
cmd/mist/ui_lib.go | 4 +++-
cmd/utils/cmd.go | 6 +++++-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index 5df4c8aad2..0848d13d53 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -866,6 +866,7 @@ ApplicationWindow {
model: ListModel { id: pastPeers }
Component.onCompleted: {
+ pastPeers.insert(0, {text: "poc-8.ethdev.com:30303"})
/*
var ips = eth.pastPeers()
for(var i = 0; i < ips.length; i++) {
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go
index 8e533d9772..9efec65276 100644
--- a/cmd/mist/gui.go
+++ b/cmd/mist/gui.go
@@ -112,7 +112,7 @@ func (gui *Gui) Start(assetPath string) {
// Expose the eth library and the ui library to QML
context.SetVar("gui", gui)
context.SetVar("eth", gui.uiLib)
- //context.SetVar("shh", gui.whisper)
+ context.SetVar("shh", gui.whisper)
// Load the main QML interface
data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go
index 4a92f64796..0aabb87d09 100644
--- a/cmd/mist/ui_lib.go
+++ b/cmd/mist/ui_lib.go
@@ -195,7 +195,9 @@ func (ui *UiLib) Connect(button qml.Object) {
}
func (ui *UiLib) ConnectToPeer(addr string) {
- ui.eth.SuggestPeer(addr)
+ if err := ui.eth.SuggestPeer(addr); err != nil {
+ guilogger.Infoln(err)
+ }
}
func (ui *UiLib) AssetPath(p string) string {
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 7e6dd5f912..d01d9da9f9 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -100,7 +100,11 @@ func exit(err error) {
func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) {
clilogger.Infof("Starting %s", ethereum.ClientIdentity())
- ethereum.Start(UseSeed)
+ err := ethereum.Start(UseSeed)
+ if err != nil {
+ exit(err)
+ }
+
RegisterInterrupt(func(sig os.Signal) {
ethereum.Stop()
logger.Flush()
--
GitLab