Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-19 03:01:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/micahflee/onionshare

Browse Source
This commit is contained in:
Thomas White 2014-06-22 10:16:13 -04:00
commit 6e707d5452
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
onionshare_gui/onionshare_gui.py
View File

@ -8,6 +8,16 @@ print "after path change"
import onionshare import onionshare
import webapp import webapp
onionshare_gui_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
try:
import onionshare
except ImportError:
sys.path.append(os.path.abspath(onionshare_gui_dir+"/.."))
import onionshare
import webapp
window_icon = None window_icon = None
class Application(QApplication): class Application(QApplication):
@ -83,8 +93,7 @@ def main():
return return
# create the onionshare icon # create the onionshare icon
global window_icon global window_icon, onionshare_gui_dir
onionshare_gui_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
window_icon = QIcon("{0}/onionshare-icon.png".format(onionshare_gui_dir)) window_icon = QIcon("{0}/onionshare-icon.png".format(onionshare_gui_dir))
# try starting hidden service # try starting hidden service