From 8c7a7aaf201e4ca3cd31adebaa456607f5967e56 Mon Sep 17 00:00:00 2001 From: binix Date: Thu, 8 Jan 2015 17:09:55 +0000 Subject: [PATCH 1/6] Stop the icon database from being created when private-browsing is set to true --- qutebrowser/config/websettings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py index 131025bea..2754aafb4 100644 --- a/qutebrowser/config/websettings.py +++ b/qutebrowser/config/websettings.py @@ -195,7 +195,10 @@ def _set_setting(typ, arg, default=UNSET, value=UNSET): def init(): """Initialize the global QWebSettings.""" cachedir = standarddir.get(QStandardPaths.CacheLocation) - QWebSettings.setIconDatabasePath(cachedir) + if config.get('general', 'private-browsing'): + QWebSettings.setIconDatabasePath('') + else: + QWebSettings.setIconDatabasePath(cachedir) QWebSettings.setOfflineWebApplicationCachePath( os.path.join(cachedir, 'application-cache')) datadir = standarddir.get(QStandardPaths.DataLocation) From 6d0fff1c2493f74776e232bbae2361ae3430c578 Mon Sep 17 00:00:00 2001 From: binix Date: Thu, 8 Jan 2015 23:39:40 +0000 Subject: [PATCH 2/6] add cache folder to files section of man page --- doc/qutebrowser.1.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc index a23fab9ed..fccbc1bd0 100644 --- a/doc/qutebrowser.1.asciidoc +++ b/doc/qutebrowser.1.asciidoc @@ -90,6 +90,7 @@ It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl. - '~/.config/qutebrowser/quickmarks': Saved quickmarks. - '~/.config/qutebrowser/keys.conf': Defined keybindings. - '~/.local/share/qutebrowser/': Various state information +- '~/.cache/qutebrowser': Cached information == BUGS Bugs are tracked in the Github issue tracker at From 969c3550cdc91d8307fdcc67abca731f32bd7b2b Mon Sep 17 00:00:00 2001 From: sbinix Date: Fri, 9 Jan 2015 23:25:53 +0000 Subject: [PATCH 3/6] revert qutebrowser.1.asciidoc --- doc/qutebrowser.1.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc index fccbc1bd0..a23fab9ed 100644 --- a/doc/qutebrowser.1.asciidoc +++ b/doc/qutebrowser.1.asciidoc @@ -90,7 +90,6 @@ It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl. - '~/.config/qutebrowser/quickmarks': Saved quickmarks. - '~/.config/qutebrowser/keys.conf': Defined keybindings. - '~/.local/share/qutebrowser/': Various state information -- '~/.cache/qutebrowser': Cached information == BUGS Bugs are tracked in the Github issue tracker at From c83775cf294d40ffd0b684dfc61aead14d7e9d69 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 18 Mar 2015 20:20:04 +0100 Subject: [PATCH 4/6] Update icon db path when private-browsing changed. --- qutebrowser/config/websettings.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py index 8fc4f1084..61873bd01 100644 --- a/qutebrowser/config/websettings.py +++ b/qutebrowser/config/websettings.py @@ -394,9 +394,15 @@ def init(): def update_settings(section, option): """Update global settings when qwebsettings changed.""" - try: - mapping = MAPPINGS[section][option] - except KeyError: - return - value = config.get(section, option) - mapping.set(value) + if (section, option) == ('general', 'private-browsing'): + if config.get('general', 'private-browsing'): + QWebSettings.setIconDatabasePath('') + else: + QWebSettings.setIconDatabasePath(standarddir.cache()) + else: + try: + mapping = MAPPINGS[section][option] + except KeyError: + return + value = config.get(section, option) + mapping.set(value) From 1a534454e28fc7efbc1225df3ff745f08e2bd526 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 18 Mar 2015 20:24:47 +0100 Subject: [PATCH 5/6] Make it possible to correct author names in src2asciidoc. --- scripts/src2asciidoc.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/src2asciidoc.py b/scripts/src2asciidoc.py index cd489a0aa..451126284 100755 --- a/scripts/src2asciidoc.py +++ b/scripts/src2asciidoc.py @@ -324,8 +324,11 @@ def generate_settings(filename): def _get_authors(): """Get a list of authors based on git commit logs.""" + corrections = {'binix': 'sbinix'} commits = subprocess.check_output(['git', 'log', '--format=%aN']) - cnt = collections.Counter(commits.decode('utf-8').splitlines()) + authors = [corrections.get(author, author) + for author in commits.decode('utf-8').splitlines()] + cnt = collections.Counter(authors) return sorted(cnt, key=lambda k: (cnt[k], k), reverse=True) From e3f9a0861160e7c46419e3ba3abd5aa112302429 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 18 Mar 2015 20:24:54 +0100 Subject: [PATCH 6/6] Regenerate docs --- README.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.asciidoc b/README.asciidoc index 8669fdb36..c6925e2a7 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -142,6 +142,7 @@ Contributors, sorted by the number of commits in descending order: * Martin Zimmermann * Error 800 * Brian Jackson +* sbinix * Johannes Altmanninger * Samir Benmendil * Regina Hug