diff options
| author | Christian Dywan <christian@twotoasts.de> | 2019-07-07 15:31:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-07 15:31:23 +0200 |
| commit | b7656f5f7e74bf85758b4b4aff384716d2f23580 (patch) | |
| tree | f89cfb486e21cf5f6cd45dd6b85e179dca2fc4e8 | |
| parent | 34e938e2abf239df658bec91b6d8e708f5177f7a (diff) | |
| download | midori-git-b7656f5f7e74bf85758b4b4aff384716d2f23580.tar.gz | |
Use web_context from context rather than the default (#338)
No puntended.
| -rw-r--r-- | core/app.vala | 2 | ||||
| -rw-r--r-- | core/clear-private-data.vala | 2 | ||||
| -rw-r--r-- | extensions/adblock/extension.vala | 2 | ||||
| -rw-r--r-- | extensions/web-extensions.vala | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/core/app.vala b/core/app.vala index 1514c58e..aa6b0bc0 100644 --- a/core/app.vala +++ b/core/app.vala @@ -224,7 +224,7 @@ namespace Midori { async void favicon_scheme (WebKit.URISchemeRequest request) { string page_uri = request.get_path ().substring (1, -1); try { - var database = WebKit.WebContext.get_default ().get_favicon_database (); + var database = request.get_web_view ().web_context.get_favicon_database (); var surface = yield database.get_favicon (page_uri, null); if (surface != null) { var image = (Cairo.ImageSurface)surface; diff --git a/core/clear-private-data.vala b/core/clear-private-data.vala index 6d336315..cbeb59a5 100644 --- a/core/clear-private-data.vala +++ b/core/clear-private-data.vala @@ -84,7 +84,7 @@ namespace Midori { types |= WebKit.WebsiteDataTypes.DISK_CACHE; } if (types != 0) { - var manager = WebKit.WebContext.get_default ().website_data_manager; + var manager = ((Browser)get_ancestor (typeof (Browser))).web_context.website_data_manager; try { yield manager.clear (types, timespan, null); } catch (Error error) { diff --git a/extensions/adblock/extension.vala b/extensions/adblock/extension.vala index 4a444168..d34b991a 100644 --- a/extensions/adblock/extension.vala +++ b/extensions/adblock/extension.vala @@ -56,7 +56,7 @@ namespace Adblock { button.destroy (); }); - WebKit.WebContext.get_default ().register_uri_scheme ("abp", (request) => { + browser.web_context.register_uri_scheme ("abp", (request) => { if (request.get_uri ().has_prefix ("abp:subscribe?location=")) { // abp://subscripe?location=http://example.com&title=foo var sub = new Subscription (request.get_uri ().substring (23, -1)); diff --git a/extensions/web-extensions.vala b/extensions/web-extensions.vala index 3fc06b49..0b1b99ae 100644 --- a/extensions/web-extensions.vala +++ b/extensions/web-extensions.vala @@ -470,7 +470,7 @@ namespace WebExtension { return; } - var context = WebKit.WebContext.get_default (); + var context = browser.web_context; context.register_uri_scheme ("extension", (request) => { request.ref (); extension_scheme.begin (request); |