[Pkg-privacy-commits] [onionshare] 169/256: Fix Settings dialog, make it so testing Tor with bundled_tor settings works

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to branch master
in repository onionshare.

commit 4d522e1e85dbd3c2282ec801a4a66ae770bb2b31
Author: Micah Lee <micah at micahflee.com>
Date:   Sun May 14 18:36:31 2017 -0700

    Fix Settings dialog, make it so testing Tor with bundled_tor settings works
---
 onionshare_gui/settings_dialog.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/onionshare_gui/settings_dialog.py b/onionshare_gui/settings_dialog.py
index 77fcbf2..c1ad6f7 100644
--- a/onionshare_gui/settings_dialog.py
+++ b/onionshare_gui/settings_dialog.py
@@ -350,6 +350,7 @@ class SettingsDialog(QtWidgets.QDialog):
 
                 def tor_status_update_func(progress, summary):
                     self._tor_status_update(progress, summary)
+                    return True
             else:
                 tor_status_update_func = None
 
@@ -467,10 +468,10 @@ class SettingsDialog(QtWidgets.QDialog):
             last_checked = strings._('gui_settings_autoupdate_timestamp_never', True)
         self.autoupdate_timestamp.setText(strings._('gui_settings_autoupdate_timestamp', True).format(last_checked))
 
-    def _tor_status_update(self, message):
-        self.tor_status.setText('<strong>{}</strong><br>{}'.format(strings._('connecting_to_tor', True), message))
+    def _tor_status_update(self, progress, summary):
+        self.tor_status.setText('<strong>{}</strong><br>{}'.format(strings._('connecting_to_tor', True), summary))
         self.qtapp.processEvents()
-        if 'Done' in message:
+        if 'Done' in summary:
             self.tor_status.hide()
             self._enable_buttons()
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onionshare.git