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

Greasemonkey: Lift greasemonkey init app.py

Browse Source 
To prepare for multiple-backend support.
This commit is contained in:
Jimmy 2017-06-07 15:49:41 +12:00
parent 25f626a436
commit be9f8bd0de
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qutebrowser/app.py
View File

@ -64,7 +64,7 @@ from qutebrowser.completion.models import miscmodels
from qutebrowser.commands import cmdutils, runners, cmdexc from qutebrowser.commands import cmdutils, runners, cmdexc
from qutebrowser.config import config, websettings, configfiles, configinit from qutebrowser.config import config, websettings, configfiles, configinit
from qutebrowser.browser import (urlmarks, adblock, history, browsertab, from qutebrowser.browser import (urlmarks, adblock, history, browsertab,
downloads) downloads, greasemonkey)
from qutebrowser.browser.network import proxy from qutebrowser.browser.network import proxy
from qutebrowser.browser.webkit import cookies, cache from qutebrowser.browser.webkit import cookies, cache
from qutebrowser.browser.webkit.network import networkmanager from qutebrowser.browser.webkit.network import networkmanager
@ -491,6 +491,10 @@ def _init_modules(args, crash_handler):
diskcache = cache.DiskCache(standarddir.cache(), parent=qApp) diskcache = cache.DiskCache(standarddir.cache(), parent=qApp)
objreg.register('cache', diskcache) objreg.register('cache', diskcache)
log.init.debug("Initializing Greasemonkey...")
gm_manager = greasemonkey.GreasemonkeyManager()
objreg.register('greasemonkey', gm_manager)
log.init.debug("Misc initialization...") log.init.debug("Misc initialization...")
macros.init() macros.init()
# Init backend-specific stuff # Init backend-specific stuff

6
qutebrowser/browser/browsertab.py
View File

@ -31,7 +31,7 @@ from qutebrowser.keyinput import modeman
from qutebrowser.config import config from qutebrowser.config import config
from qutebrowser.utils import utils, objreg, usertypes, log, qtutils from qutebrowser.utils import utils, objreg, usertypes, log, qtutils
from qutebrowser.misc import miscwidgets, objects from qutebrowser.misc import miscwidgets, objects
from qutebrowser.browser import mouse, hints, greasemonkey from qutebrowser.browser import mouse, hints
tab_id_gen = itertools.count(0) tab_id_gen = itertools.count(0)
@ -64,10 +64,6 @@ def init():
from qutebrowser.browser.webengine import webenginetab from qutebrowser.browser.webengine import webenginetab
webenginetab.init() webenginetab.init()
log.init.debug("Initializing Greasemonkey...")
gm_manager = greasemonkey.GreasemonkeyManager()
objreg.register('greasemonkey', gm_manager)
class WebTabError(Exception): class WebTabError(Exception):