diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-13 23:08:30 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-13 23:08:30 +0800 |
| commit | 5c251b69282b3992512d0c17ed0063f294a0e663 (patch) | |
| tree | 7842c1a6ac8394e8bebfd4f27c9222b497aaf0f6 /cmd/mist/gui.go | |
| parent | 75d164037fb9bbf75def7c5501727fd634ef124f (diff) | |
| parent | bde3ff16ad98cb4ab0befc899f7f0584d21ff9a4 (diff) | |
| download | dexon-5c251b69282b3992512d0c17ed0063f294a0e663.tar dexon-5c251b69282b3992512d0c17ed0063f294a0e663.tar.gz dexon-5c251b69282b3992512d0c17ed0063f294a0e663.tar.bz2 dexon-5c251b69282b3992512d0c17ed0063f294a0e663.tar.lz dexon-5c251b69282b3992512d0c17ed0063f294a0e663.tar.xz dexon-5c251b69282b3992512d0c17ed0063f294a0e663.tar.zst dexon-5c251b69282b3992512d0c17ed0063f294a0e663.zip | |
Merge branch 'fjl-poc8-net-integration' into develop
Diffstat (limited to 'cmd/mist/gui.go')
| -rw-r--r-- | cmd/mist/gui.go | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index edc799abc..dee99859c 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -41,7 +41,6 @@ import ( "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/ui/qt/qwhisper" "github.com/ethereum/go-ethereum/xeth" "github.com/obscuren/qml" @@ -77,9 +76,8 @@ type Gui struct { xeth *xeth.XEth - Session string - clientIdentity *p2p.SimpleClientIdentity - config *ethutil.ConfigManager + Session string + config *ethutil.ConfigManager plugins map[string]plugin @@ -87,7 +85,7 @@ type Gui struct { } // Create GUI, but doesn't start it -func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, clientIdentity *p2p.SimpleClientIdentity, session string, logLevel int) *Gui { +func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, session string, logLevel int) *Gui { db, err := ethdb.NewLDBDatabase("tx_database") if err != nil { panic(err) @@ -95,15 +93,14 @@ func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, clientIden xeth := xeth.New(ethereum) gui := &Gui{eth: ethereum, - txDb: db, - xeth: xeth, - logLevel: logger.LogLevel(logLevel), - Session: session, - open: false, - clientIdentity: clientIdentity, - config: config, - plugins: make(map[string]plugin), - serviceEvents: make(chan ServEv, 1), + txDb: db, + xeth: xeth, + logLevel: logger.LogLevel(logLevel), + Session: session, + open: false, + config: config, + plugins: make(map[string]plugin), + serviceEvents: make(chan ServEv, 1), } data, _ := ethutil.ReadAllFile(path.Join(ethutil.Config.ExecPath, "plugins.json")) json.Unmarshal([]byte(data), &gui.plugins) |