From b79dd188d916da7adbf448dc27b0c59a04e0938d Mon Sep 17 00:00:00 2001
From: Bas van Kervel <basvankervel@ziggo.nl>
Date: Tue, 12 May 2015 14:24:11 +0200
Subject: replaced several path.* with filepath.* which is platform independent
---
cmd/mist/gui.go | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'cmd/mist/gui.go')
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go
index 66614478c..36eb488ce 100644
--- a/cmd/mist/gui.go
+++ b/cmd/mist/gui.go
@@ -27,11 +27,12 @@ import (
"fmt"
"io/ioutil"
"math/big"
- "path"
"runtime"
"sort"
"time"
+ "path/filepath"
+
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
@@ -79,7 +80,7 @@ type Gui struct {
// Create GUI, but doesn't start it
func NewWindow(ethereum *eth.Ethereum) *Gui {
- db, err := ethdb.NewLDBDatabase(path.Join(ethereum.DataDir, "tx_database"))
+ db, err := ethdb.NewLDBDatabase(filepath.Join(ethereum.DataDir, "tx_database"))
if err != nil {
panic(err)
}
@@ -92,7 +93,7 @@ func NewWindow(ethereum *eth.Ethereum) *Gui {
plugins: make(map[string]plugin),
serviceEvents: make(chan ServEv, 1),
}
- data, _ := ioutil.ReadFile(path.Join(ethereum.DataDir, "plugins.json"))
+ data, _ := ioutil.ReadFile(filepath.Join(ethereum.DataDir, "plugins.json"))
json.Unmarshal(data, &gui.plugins)
return gui
--
cgit v1.2.3
From 95773b9673ac78fdceb152d1dd2528f90e8a02b7 Mon Sep 17 00:00:00 2001
From: Bas van Kervel <basvankervel@ziggo.nl>
Date: Tue, 12 May 2015 15:20:53 +0200
Subject: removed redundant newlines in import block
---
cmd/mist/gui.go | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'cmd/mist/gui.go')
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go
index 36eb488ce..53194ae50 100644
--- a/cmd/mist/gui.go
+++ b/cmd/mist/gui.go
@@ -27,12 +27,11 @@ import (
"fmt"
"io/ioutil"
"math/big"
+ "path/filepath"
"runtime"
"sort"
"time"
- "path/filepath"
-
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
--
cgit v1.2.3