embed/ephy-web-view.c | 7 4 + 3 - 0 !
1 file changed, 4 insertions(+), 3 deletions(-)

 remember printer settings

Keep track of printer settings and restore if needed.

Fixes: https://gitlab.gnome.org/GNOME/epiphany/issues/138

(cherry picked from commit 8f6fecdfa9be86a5adaf097b6ddbe9eb48843462)

po/hr.po | 1615 880 + 735 - 0 !
1 file changed, 880 insertions(+), 735 deletions(-)

 update croatian translation

embed/ephy-web-view.c | 12 6 + 6 - 0 !
1 file changed, 6 insertions(+), 6 deletions(-)

 web-view: fix crash when changing reader mode preferences

We shouldn't run the signal handler after the web view is destroyed.

Fixes #706

(cherry picked from commit 63fcfdd651b2c5ebb451598ba362fd5e3b4ced6e)

embed/ephy-about-handler.c | 2 1 + 1 - 0 !
src/resources/about.css | 2 1 + 1 - 0 !
src/resources/epiphany.gresource.xml | 4 2 + 2 - 0 !
src/resources/private-mode.svg | 506 506 + 0 - 0 !
src/resources/web-watermark.svg | 129 129 + 0 - 0 !
src/synced-tabs-dialog.c | 2 1 + 1 - 0 !
6 files changed, 640 insertions(+), 5 deletions(-)

 replace incognito.png and missing-thumbnail.png with svg files

Fixes: https://gitlab.gnome.org/GNOME/epiphany/issues/257

(cherry picked from commit 3d767ffdb8ba75969cb0820f212632539d1ae090)

src/search-provider/ephy-search-provider.c | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 search-provider: don't assume there's always a matching suggestion

There actually should always be a suggestion, unless gnome-shell is
bugged or malicious, but we should be well-behaved and not crash here if
there isn't. It's external input, after all.

https://bugzilla.redhat.com/show_bug.cgi?id=1696529

(cherry picked from commit 70cc8e349dad2030f962a33365ac35682dc81fe2)

lib/ephy-suggestion.c | 14 8 + 6 - 0 !
lib/ephy-suggestion.h | 6 4 + 2 - 0 !
src/ephy-suggestion-model.c | 6 3 + 3 - 0 !
3 files changed, 15 insertions(+), 11 deletions(-)

 fix search provider results

We're displaying XML in the search provider results because the
unescaped-title property is not being set properly.

(cherry picked from commit 742b84530353923431e43fbc98924b5d3cf69005)

po/da.po | 282 141 + 141 - 0 !
1 file changed, 141 insertions(+), 141 deletions(-)

 updated danish translation

po/ca.po | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 update catalan translation

po/ca.po | 18 9 + 9 - 0 !
1 file changed, 9 insertions(+), 9 deletions(-)

 update catalan translation

po/da.po | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 updated danish translation

embed/ephy-embed-shell.c | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

 fix crash when username_field is detected with no username

The current code is obviously a mistake -- my bad -- since there's no
point in freeing a variable that is known to be NULL.

embed/web-extension/ephy-web-extension.c | 20 16 + 4 - 0 !
embed/web-extension/resources/js/ephy.js | 14 11 + 3 - 0 !
meson.build | 2 1 + 1 - 0 !
3 files changed, 28 insertions(+), 8 deletions(-)

 web-extension: don't prompt to remember passwords when disabled

When the remember passwords setting is disabled, we should try harder to
avoid executing any related code.

This requires a WebKitGTK version bump due to https://bugs.webkit.org/show_bug.cgi?id=196073

Fixes #725

src/ephy-shell.c | 18 9 + 9 - 0 !
1 file changed, 9 insertions(+), 9 deletions(-)

 fix too many actions disabled in incognito/automation mode

These are only supposed to be disabled in app mode. Too many braces here
is resulting in slightly confusing code.

Fixes #724

(cherry picked from commit 253295c67328cb4ec195b9ba2b5aecd98272cb45)

lib/safe-browsing/ephy-gsb-service.c | 4 3 + 1 - 0 !
1 file changed, 3 insertions(+), 1 deletion(-)

 gsb-service: ref self for lifetime of update thread

Fixes #736

(cherry picked from commit cefc3e33cca914cdc3130e589bc855491baaf004)

lib/meson.build | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 lib: give libephymisc a runpath pointing to our private libraries

The shared libephymisc depends on libdazzle, and gets loaded by the web
extension. libdazzle might be a private library from the subproject, and
setting a RUNPATH on libephywebextension (which does not itself depend
on libdazzle) is not sufficient to get the private libdazzle loaded,
at least when building with -Wl,--as-needed.

Signed-off-by: Simon McVittie <smcv@debian.org>
Bug-Debian: https://bugs.debian.org/927731

meson.build | 10 5 + 5 - 0 !
1 file changed, 5 insertions(+), 5 deletions(-)

 install as epiphany-browser not epiphany

data/default-bookmarks.rdf.in | 17 17 + 0 - 0 !
1 file changed, 17 insertions(+)

 add default bookmarks for debian

data/org.gnome.Epiphany.appdata.xml.in | 1 0 + 1 - 0 !
1 file changed, 1 deletion(-)

 appdata: don't mark as compulsory for gnome

Upstream mark it as a system application that cannot be removed, because
it's GNOME's default web browser, but our default in Debian is Firefox.

Allow users to uninstall this app if they wish.

tests/meson.build | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

 disable webapps test