Merge branch 'master' of https://github.com/sbinix/qutebrowser into sbinix-master

Conflicts:
	qutebrowser/config/websettings.py
This commit is contained in:
Florian Bruhin 2015-03-18 20:16:36 +01:00
commit 706cc1a87f

View File

@ -369,7 +369,10 @@ MAPPINGS = {
def init(): def init():
"""Initialize the global QWebSettings.""" """Initialize the global QWebSettings."""
QWebSettings.setIconDatabasePath(standarddir.cache()) if config.get('general', 'private-browsing'):
QWebSettings.setIconDatabasePath('')
else:
QWebSettings.setIconDatabasePath(standarddir.cache())
QWebSettings.setOfflineWebApplicationCachePath( QWebSettings.setOfflineWebApplicationCachePath(
os.path.join(standarddir.cache(), 'application-cache')) os.path.join(standarddir.cache(), 'application-cache'))
QWebSettings.globalSettings().setLocalStoragePath( QWebSettings.globalSettings().setLocalStoragePath(