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

Fix conflict from develop branch

Browse source
This commit is contained in:
Miguel Jacq 2018-09-04 11:43:35 +10:00
commit 32f0e39a46
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
onionshare_gui/settings_dialog.py
View file

@ -489,7 +489,7 @@ class SettingsDialog(QtWidgets.QDialog):
self.tor_bridges_use_custom_textbox_options.hide()
# Alert the user about meek's costliness if it looks like they're turning it on
if not self.old_settings.get('tor_bridges_use_meek_lite_azure'):
Alert(strings._('gui_settings_meek_lite_expensive_warning', True), QtWidgets.QMessageBox.Warning)
Alert(self.common, strings._('gui_settings_meek_lite_expensive_warning', True), QtWidgets.QMessageBox.Warning)
def tor_bridges_use_custom_radio_toggled(self, checked):
"""
@ -692,7 +692,7 @@ class SettingsDialog(QtWidgets.QDialog):
self.common.log('SettingsDialog', 'save_clicked', 'rebooting the Onion')
self.onion.cleanup()
tor_con = TorConnectionDialog(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))