mirror of
https://github.com/onionshare/onionshare.git
synced 2025-01-01 02:36:14 -05:00
Merge branch 'master' of https://github.com/micahflee/onionshare
This commit is contained in:
commit
6e707d5452
@ -8,6 +8,16 @@ print "after path change"
|
||||
import onionshare
|
||||
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
|
||||
|
||||
class Application(QApplication):
|
||||
@ -83,8 +93,7 @@ def main():
|
||||
return
|
||||
|
||||
# create the onionshare icon
|
||||
global window_icon
|
||||
onionshare_gui_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
|
||||
global window_icon, onionshare_gui_dir
|
||||
window_icon = QIcon("{0}/onionshare-icon.png".format(onionshare_gui_dir))
|
||||
|
||||
# try starting hidden service
|
||||
|
Loading…
Reference in New Issue
Block a user