Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-24 09:01:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move settings into the Common object, so the settings are available to all objects (including Web, which is required for receive mode)

Browse source
This commit is contained in:
Micah Lee 2018-03-13 03:28:47 -07:00
parent 37389f85ac
commit 14d7921bb9
8 changed files with 72 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
onionshare_gui/settings_dialog.py
View file

@ -599,8 +599,8 @@ class SettingsDialog(QtWidgets.QDialog):
else:
tor_status_update_func = None
onion = Onion()
onion.connect(settings=settings, config=self.config, tor_status_update_func=tor_status_update_func)
onion = Onion(self.common)
onion.connect(custom_settings=settings, config=self.config, tor_status_update_func=tor_status_update_func)
# If an exception hasn't been raised yet, the Tor settings work
Alert(self.common, strings._('settings_test_success', True).format(onion.tor_version, onion.supports_ephemeral, onion.supports_stealth))
@ -707,7 +707,7 @@ class SettingsDialog(QtWidgets.QDialog):
self.common.log('SettingsDialog', 'save_clicked', 'rebooting the Onion')
self.onion.cleanup()
tor_con = TorConnectionDialog(self.common, self.qtapp, settings, self.onion)
tor_con = TorConnectionDialog(self.common, self.qtapp, self.onion, settings)
tor_con.start()
self.common.log('SettingsDialog', 'save_clicked', 'Onion done rebooting, connected to Tor: {}'.format(self.onion.connected_to_tor))