commit so I can pull

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_())