[Pkg-privacy-commits] [torbrowser-launcher] 02/02: Revert "make socks4 port configurable. (Closes: #797339)"

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch debian/proposed
in repository torbrowser-launcher.

commit e57ea2327a3b9b3febe5525c4c12b9e1136bf5de
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Mar 1 16:33:36 2016 +0100

    Revert "make socks4 port configurable. (Closes: #797339)"
    
    This reverts commit 41b1e9b5c22653b0d0bd281accbb15421daaa10b.
---
 torbrowser_launcher/common.py   |  1 -
 torbrowser_launcher/launcher.py |  4 ++--
 torbrowser_launcher/settings.py | 16 ----------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
index 531067d..1eddb54 100644
--- a/torbrowser_launcher/common.py
+++ b/torbrowser_launcher/common.py
@@ -194,7 +194,6 @@ class Common:
             'installed': False,
             'download_over_tor': False,
             'modem_sound': False,
-            'tor_socks_address': 'tcp:127.0.0.1:9050',
             'mirror': self.default_mirror
         }
 
diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
index 9049cd9..1f2dadd 100644
--- a/torbrowser_launcher/launcher.py
+++ b/torbrowser_launcher/launcher.py
@@ -408,10 +408,10 @@ class Launcher:
         self.refresh_gtk()
 
         if self.common.settings['download_over_tor']:
-            from twisted.internet.endpoints import clientFromString
+            from twisted.internet.endpoints import TCP4ClientEndpoint
             from txsocksx.http import SOCKS5Agent
 
-            torEndpoint = clientFromString(reactor, self.common.settings['tor_socks_address'])
+            torEndpoint = TCP4ClientEndpoint(reactor, '127.0.0.1', 9050)
 
             # default mirror gets certificate pinning, only for requests that use the mirror
             if self.common.settings['mirror'] == self.common.default_mirror and '{0}' in url:
diff --git a/torbrowser_launcher/settings.py b/torbrowser_launcher/settings.py
index 7c782df..57b8e32 100644
--- a/torbrowser_launcher/settings.py
+++ b/torbrowser_launcher/settings.py
@@ -101,21 +101,6 @@ class Settings:
             self.modem_checkbox.set_tooltip_text(_("This option requires python-pygame to be installed"))
         self.modem_checkbox.show()
 
-        # Tor SOCKS address
-        self.tor_addr_box = gtk.HBox(False, 10)
-        self.settings_box.pack_start(self.tor_addr_box, True, True, 0)
-        self.tor_addr_box.show()
-
-        self.tor_addr_label = gtk.Label(_('Tor server'))
-        self.tor_addr_label.set_line_wrap(True)
-        self.tor_addr_box.pack_start(self.tor_addr_label, True, True, 0)
-        self.tor_addr_label.show()
-
-        self.tor_addr = gtk.Entry()
-        self.tor_addr.set_text(self.common.settings['tor_socks_address'])
-        self.tor_addr_box.pack_start(self.tor_addr, True, True, 0)
-        self.tor_addr.show()
-
         # status
         if(self.common.settings['installed']):
             self.status_label = gtk.Label(_('Status: Installed'))
@@ -227,7 +212,6 @@ class Settings:
         # checkbox options
         self.common.settings['download_over_tor'] = self.tor_download_checkbox.get_active()
         self.common.settings['modem_sound'] = self.modem_checkbox.get_active()
-        self.common.settings['tor_socks_address'] = self.tor_addr.get_text()
 
         # figure out the selected mirror
         self.common.settings['mirror'] = self.common.mirrors[self.mirrors.get_active()]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git