[Pkg-privacy-commits] [onionshare] 41/55: Refactor onionshare GUI to use await_publication=True when using ephemeral onion services

[Ulrike Uhlig]

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

u-guest pushed a commit to branch debian
in repository onionshare.

commit b7d1a7339c9a945140c8fa0aeb6ef2f302b84345
Author: Micah Lee <micah at micahflee.com>
Date:   Mon Sep 5 11:36:41 2016 -0700

    Refactor onionshare GUI to use await_publication=True when using ephemeral onion services
---
 onionshare_gui/onionshare_gui.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index abb8639..5e1ea47 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -150,14 +150,14 @@ class OnionShareGui(QtWidgets.QMainWindow):
         self.status_bar.showMessage(strings._('gui_starting_server1', True))
         self.app.choose_port()
         try:
-            self.app.start_onion_service(gui=True)
+            self.app.start_onion_service()
         except onionshare.onion.NoTor as e:
             alert(e.args[0], QtWidgets.QMessageBox.Warning)
             self.server_status.stop_server()
             self.status_bar.clearMessage()
             return
 
-        # start onionshare service in new thread
+        # start onionshare http service in new thread
         t = threading.Thread(target=web.start, args=(self.app.port, self.app.stay_open, self.app.transparent_torification))
         t.daemon = True
         t.start()
@@ -170,7 +170,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
             self.starting_server_step2.emit()
 
             # wait for hs
-            if not self.app.local_only:
+            if not self.app.local_only and not self.app.onion.supports_ephemeral:
                 self.status_bar.showMessage(strings._('gui_starting_server3', True))
                 self.app.onion.wait_for_hs(self.app.onion_host)
 

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