diff options
| author | obscuren <geffobscura@gmail.com> | 2015-05-13 01:05:33 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-05-13 01:05:33 +0800 |
| commit | 8e24378cc1acb074b56de75bf0baf6feb7927677 (patch) | |
| tree | 71f866652de6b45da5ad4403b88f5def9a684e36 /cmd/mist/gui.go | |
| parent | 7d69679935ff8c04aebb60f27074f08c5e84ac95 (diff) | |
| parent | 8fe01b4bfa28ad5a1fdde7f9837e8f982843389a (diff) | |
| download | go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.tar go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.tar.gz go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.tar.bz2 go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.tar.lz go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.tar.xz go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.tar.zst go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.zip | |
Merge branch 'release/0.9.20'v0.9.20
Diffstat (limited to 'cmd/mist/gui.go')
| -rw-r--r-- | cmd/mist/gui.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index 66614478c..f443bacbc 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -27,7 +27,7 @@ import ( "fmt" "io/ioutil" "math/big" - "path" + "path/filepath" "runtime" "sort" "time" @@ -79,7 +79,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 +92,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 @@ -232,7 +232,7 @@ func (self *Gui) loadMergedMiningOptions() { func (gui *Gui) insertTransaction(window string, tx *types.Transaction) { var inout string from, _ := tx.From() - if gui.eth.AccountManager().HasAccount(common.Hex2Bytes(from.Hex())) { + if gui.eth.AccountManager().HasAccount(from) { inout = "send" } else { inout = "recv" |