rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '74759fe04c0fa1d465cb36d3f8b00d6ebd9ef49d'

Browse Source
This commit is contained in:
Florian Bruhin 2018-02-09 22:31:34 +01:00
commit 207107082d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qutebrowser/browser/commands.py
View File

@ -1220,6 +1220,7 @@ class CommandDispatcher:
log.procs.debug("Executing {} with args {}, userscript={}".format( log.procs.debug("Executing {} with args {}, userscript={}".format(
cmd, args, userscript)) cmd, args, userscript))
@pyqtSlot()
def _on_proc_finished(): def _on_proc_finished():
if output: if output:
tb = objreg.get('tabbed-browser', scope='window', tb = objreg.get('tabbed-browser', scope='window',

3
qutebrowser/browser/network/proxy.py
View File

@ -61,7 +61,8 @@ class ProxyFactory(QNetworkProxyFactory):
""" """
proxy = config.val.content.proxy proxy = config.val.content.proxy
if proxy is configtypes.SYSTEM_PROXY: if proxy is configtypes.SYSTEM_PROXY:
# On Linux, use "export http_proxy=socks5://host:port" to manually set system proxy # On Linux, use "export http_proxy=socks5://host:port" to manually
# set system proxy.
# ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
proxies = QNetworkProxyFactory.systemProxyForQuery(query) proxies = QNetworkProxyFactory.systemProxyForQuery(query)
elif isinstance(proxy, pac.PACFetcher): elif isinstance(proxy, pac.PACFetcher):