From 5dd19bbf808e7f1387c8517657bdbf41afe6b0d2 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Sun, 22 Jun 2014 10:15:59 -0400 Subject: [PATCH] commit so I can pull --- onionshare_gui/onionshare_gui.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py index 945813e6..b58441d3 100644 --- a/onionshare_gui/onionshare_gui.py +++ b/onionshare_gui/onionshare_gui.py @@ -2,10 +2,11 @@ import os, sys, subprocess, inspect from PyQt4.QtCore import * from PyQt4.QtGui import * from PyQt4.QtWebKit import * - from os import path -sys.path.append(path.dirname(path.dirname(path.abspath(__file__)))) -import onionshare, webapp +print "after path import" +print "after path change" +import onionshare +import webapp window_icon = None @@ -70,6 +71,7 @@ def select_file(strings): return filename, basename def main(): + print "start main" onionshare.strings = onionshare.load_strings() # start the Qt app @@ -112,6 +114,7 @@ def main(): onionshare.tails_open_port(webapp_port) webapp_thread = WebAppThread(webapp_port) webapp_thread.start() + print "after webapp functs" # clean up when app quits def shutdown(): @@ -122,7 +125,7 @@ def main(): # launch the window web = Window(basename, webapp_port) web.show() - + print "after show happens" # all done sys.exit(app.exec_())