diff options
author | obscuren <geffobscura@gmail.com> | 2015-03-06 23:40:21 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-03-06 23:40:21 +0800 |
commit | 548e1041718ffc0ee0659f1ff99b37cad38190c0 (patch) | |
tree | dc354aae2e364e4a2a426efc0ca5f6412acfa980 /cmd/mist | |
parent | 8d9be18b296afb8302249dcc96651aabb0975e26 (diff) | |
parent | e64f727529287b7414af6d1f482ea5f318cbd2eb (diff) | |
download | dexon-548e1041718ffc0ee0659f1ff99b37cad38190c0.tar.gz dexon-548e1041718ffc0ee0659f1ff99b37cad38190c0.tar.zst dexon-548e1041718ffc0ee0659f1ff99b37cad38190c0.zip |
Merge branch 'poc-9' of github.com-obscure:ethereum/go-ethereum into poc-9
Diffstat (limited to 'cmd/mist')
-rw-r--r-- | cmd/mist/bindings.go | 4 | ||||
-rw-r--r-- | cmd/mist/gui.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/mist/bindings.go b/cmd/mist/bindings.go index 9623538a3..f21aa3135 100644 --- a/cmd/mist/bindings.go +++ b/cmd/mist/bindings.go @@ -79,14 +79,14 @@ func (self *Gui) AddPlugin(pluginPath string) { self.plugins[pluginPath] = plugin{Name: pluginPath, Path: pluginPath} json, _ := json.MarshalIndent(self.plugins, "", " ") - ethutil.WriteFile(ethutil.Config.ExecPath+"/plugins.json", json) + ethutil.WriteFile(self.eth.DataDir+"/plugins.json", json) } func (self *Gui) RemovePlugin(pluginPath string) { delete(self.plugins, pluginPath) json, _ := json.MarshalIndent(self.plugins, "", " ") - ethutil.WriteFile(ethutil.Config.ExecPath+"/plugins.json", json) + ethutil.WriteFile(self.eth.DataDir+"/plugins.json", json) } // this extra function needed to give int typecast value to gui widget diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index a69049894..869b689dd 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -99,7 +99,7 @@ func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, session st plugins: make(map[string]plugin), serviceEvents: make(chan ServEv, 1), } - data, _ := ethutil.ReadAllFile(path.Join(ethutil.Config.ExecPath, "plugins.json")) + data, _ := ethutil.ReadAllFile(path.Join(ethereum.DataDir, "plugins.json")) json.Unmarshal([]byte(data), &gui.plugins) return gui |