torproject/torbrowser-launcher
1
0
Fork 0
mirror of https://github.com/torproject/torbrowser-launcher.git synced 2024-11-26 19:10:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update location of start-tor-browser for TBB 4.5, and remove accept_links feature #176

Browse Source
This commit is contained in:
Micah Lee 2015-05-11 14:04:01 -07:00
parent 8af8256275
commit 3d9f4edc20
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
torbrowser_launcher/common.py
View File

@ -145,7 +145,7 @@ class Common:
'update_check_file': tbb_cache+'/download/RecommendedTBBVersions',
'tbb': {
'dir': tbb_local+'/tbb/'+self.architecture,
'start': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/start-tor-browser',
'start': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/Browser/start-tor-browser',
'versions': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/Browser/TorBrowser/Docs/sources/versions',
},
}
@ -198,8 +198,7 @@ class Common:
'check_for_updates': False,
'modem_sound': False,
'last_update_check_timestamp': 0,
'mirror': self.default_mirror,
'accept_links': False
'mirror': self.default_mirror
}
if os.path.isfile(self.paths['settings_file']):

6
torbrowser_launcher/launcher.py
View File

@ -634,10 +634,7 @@ class Launcher:
gtk.main_iteration_do(True)
# run Tor Browser
if self.common.settings['accept_links']:
subprocess.call([self.common.paths['tbb']['start'], '-allow-remote'] + self.url_list)
else:
subprocess.call([self.common.paths['tbb']['start']])
subprocess.call([self.common.paths['tbb']['start'], '--detach'])
if run_next_task:
self.run_task()
@ -674,4 +671,3 @@ class Launcher:
delattr(self, 'current_download_url')
if reactor.running:
reactor.stop()

12
torbrowser_launcher/settings.py
View File

@ -95,15 +95,6 @@ class Settings:
self.update_checkbox.set_active(False)
self.update_checkbox.show()
# accept links
self.accept_links = gtk.CheckButton(_("Allow opening links with Tor Browser\n(this doesn't work if you use Firefox)"))
self.settings_box.pack_start(self.accept_links, True, True, 0)
if self.common.settings['accept_links']:
self.accept_links.set_active(True)
else:
self.accept_links.set_active(False)
self.accept_links.show()
# modem sound
self.modem_checkbox = gtk.CheckButton(_("Play modem sound, because Tor is slow :]"))
self.settings_box.pack_start(self.modem_checkbox, True, True, 0)
@ -222,7 +213,6 @@ class Settings:
# checkbox options
self.common.settings['update_over_tor'] = self.tor_update_checkbox.get_active()
self.common.settings['check_for_updates'] = self.update_checkbox.get_active()
self.common.settings['accept_links'] = self.accept_links.get_active()
self.common.settings['modem_sound'] = self.modem_checkbox.get_active()
# figure out the selected mirror
@ -237,5 +227,3 @@ class Settings:
def destroy(self, widget, data=None):
gtk.main_quit()