lp:~midori/midori/webKitTwoOnly

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:midori

Midori Devs: Pending requested 2016-02-07

Diff: 6316 lines (+248/-3830) (has conflicts)

43 files modified

CMakeLists.txt (+19/-54)
data/gtk3.css (+1/-6)
extensions/CMakeLists.txt (+9/-11)
extensions/about.vala (+0/-4)
extensions/adblock/extension.vala (+26/-60)
extensions/adblock/subscriptions.vala (+0/-34)
extensions/addons.c (+3/-3)
extensions/colorful-tabs.c (+0/-5)
extensions/cookie-manager/cookie-manager.c (+2/-8)
extensions/external-download-manager.vala (+0/-12)
extensions/feed-panel/feed-panel.c (+0/-33)
extensions/feed-panel/katze-net.c (+0/-117)
extensions/notes.vala (+0/-5)
extensions/open-with.vala (+0/-28)
extensions/transfers.vala (+0/-22)
katze/katze-item.c (+0/-27)
katze/katze.h (+1/-6)
katze/midori-paths.vala (+6/-27)
katze/midori-uri.vala (+0/-6)
midori/main.c (+3/-15)
midori/midori-browser.c (+0/-402)
midori/midori-browser.h (+0/-4)
midori/midori-contextaction.vala (+0/-2)
midori/midori-download.vala (+0/-191)
midori/midori-frontend.c (+0/-3)
midori/midori-locationaction.c (+26/-40)
midori/midori-preferences.c (+0/-29)
midori/midori-privatedata.c (+0/-39)
midori/midori-searchaction.c (+1/-118)
midori/midori-session.c (+5/-271)
midori/midori-settings.vala (+36/-33)
midori/midori-speeddial.vala (+0/-83)
midori/midori-tab.vala (+5/-46)
midori/midori-view.c (+74/-1650)
midori/midori-websettings.c (+31/-301)
midori/midori-websettings.h (+0/-9)
midori/sokoke.c (+0/-39)
tests/actions.vala (+0/-28)
tests/browser.c (+0/-7)
tests/download.vala (+0/-24)
tests/extensions.c (+0/-4)
tests/properties.c (+0/-5)
tests/tab.vala (+0/-19)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1541109: on https sites, subresource certificates are not validated

Undecided

Fix Released

Link a bug report

Related blueprints

7108. By gue5t <email address hidden> on 2016-09-05

partially fix LocationAction dropdown under Wayland

7107. By gue5t <email address hidden> on 2016-09-05

fix theming issues under GTK+ 3.20

7106. By Cris Dywan on 2016-03-21

Use load-failed-with-tls-errors to handle certificate errors

7105. By Cris Dywan on 2016-03-13

Merge lp:midori

7104. By gue5t <email address hidden> on 2016-02-22

Fix four MidoriView/MidoriTab bugs causing popup window opening to segfault or misbehave

Before these changes, clicking the first green arrow on http://javascript.info/tutorial/popup-windows results in a segfault, instead of the expected popup.

There were four bugs here:

1. The constructor for Midori.Tab was mistakenly setting the nonexistent "related" property instead of the "related-view" property.
2. The signature of webkit_web_view_create_web_view_cb did not match the signature of the "create" signal for a WK2 WebKitWebView, causing a WebKitNavigationAction to be used as a MidoriView.
3. The function called when a popup is ready to be shown was asking for the "width" and "height" properties used by WebKitWindowProperties in WK1 rather than the "geometry" property used in WK2.

(Fixing these three resulted in no more crashes, but popups would be empty instead of loading the expected URIs.)

4. An old (WK1, touched in r5389 and r842, originally in 2009) workaround was unconditionally doing "web_view.load_uri ("")" which cancelled the loading of the intended URI for popups.

After the other fixes, removing this workaround results in everything working as expected.

7103. By Cris Dywan on 2016-02-17

Use WebExtension without the bindings

7102. By gue5t <email address hidden> on 2016-02-10

support user-stylesheet-uri with wk2 by adding a WebKit.UserContentManager to Midori.Settings

7101. By Cris Dywan on 2016-02-07

Drop non-WebKit2 code paths

7100. By Cris Dywan on 2016-02-04

Make configure fail early if library is not found with zeitgeist enabled

7099. By gue5t <email address hidden> on 2016-02-03

Fix memory leaks and logic errors in extension loading and tests