commit 14cc260092b82e47aed889e862dc4a2cb80eb7ad
parent f565d79c11179183c04b27e54cfbc87f244341ef
Author: Neil Booth <kyuupichan@gmail.com>
Date: Thu, 3 Sep 2015 16:40:48 +0900
Remove redundant config argument.
Also don't default path for clarity.
Diffstat:
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
@@ -199,15 +199,13 @@ class ElectrumGui:
return
wallet = wizard.run(action, wallet_type)
if wallet:
- self.start_new_window(self.config, full_path)
+ self.start_new_window(full_path)
def new_window(self, path):
# Use a signal as can be called from daemon thread
- self.app.emit(SIGNAL('new_window'), self.config, path)
+ self.app.emit(SIGNAL('new_window'), path)
- def start_new_window(self, config, path=None):
- if path is None:
- path = config.get_wallet_path()
+ def start_new_window(self, path):
for w in self.windows:
if w.wallet.storage.path == path:
w.bring_to_top()
@@ -216,7 +214,7 @@ class ElectrumGui:
wallet = self.load_wallet_file(path)
if not wallet:
return
- w = ElectrumWindow(config, self.network, self)
+ w = ElectrumWindow(self.config, self.network, self)
w.connect_slots(self.timer)
# load new wallet in gui
@@ -230,7 +228,7 @@ class ElectrumGui:
self.windows.append(w)
self.build_tray_menu()
- url = config.get('url')
+ url = self.config.get('url')
if url:
w.pay_to_URI(url)
return w
@@ -248,7 +246,7 @@ class ElectrumGui:
self.config.cmdline_options['default_wallet_path'] = last_wallet
# main window
- self.main_window = self.start_new_window(self.config)
+ self.main_window = self.start_new_window(self.config.get_wallet_path())
if not self.main_window:
return