summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@gnome.org>2020-02-14 15:38:53 -0600
committerMichael Catanzaro <mcatanzaro@gnome.org>2020-02-14 15:38:53 -0600
commit12796df37ad2972070555e37fbe669204bfc632d (patch)
tree56529af9b5a56748d127a87469ba6ad3a9f75cae
parent2783a4acfa8214693c793a759ed20029d7b921c3 (diff)
downloadepiphany-3.34.4.tar.gz
Prepare 3.34.43.34.4
-rw-r--r--NEWS14
-rw-r--r--embed/ephy-web-view.c12
-rw-r--r--meson.build2
3 files changed, 20 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index e4d356887..62d4e7748 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+3.34.4 - February 14, 2020
+==========================
+
+ * Changing web app icon in preferences dialog should copy icon (#810, ignapk)
+ * Fix new tab page with few items in history (#986)
+ * Fix Favorites and Mobile bookmarks not tagged correctly when localized (#1015, Jonathan Kang)
+ * Fix password manager user account selector (#1018)
+ * Hide view source context menu item when on view source page (#1046)
+ * Fix memory corruption in view source mode (#1065)
+ * Fix crash when parsing session state (#1092)
+ * Fix improper warning when closing multiple tabs (#1093)
+ * Fix occasional failure to start up (!537)
+ * Fix memory corruption when loading adblock filters
+
3.34.3.1 - January 3, 2020
==========================
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 90ef031ae..b597f22f0 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2843,15 +2843,13 @@ static gboolean
script_dialog_cb (WebKitWebView *web_view,
WebKitScriptDialog *dialog)
{
- if (webkit_script_dialog_get_dialog_type (dialog) != WEBKIT_SCRIPT_DIALOG_BEFORE_UNLOAD_CONFIRM)
- return FALSE;
-
- /* Ignore beforeunload events for now until we properly support webkit_web_view_try_close()
- * See https://bugzilla.gnome.org/show_bug.cgi?id=722032.
+ /* FIXME: Ignore beforeunload events for now until we properly support webkit_web_view_try_close()
+ * See https://gitlab.gnome.org/GNOME/epiphany/issues/220.
*/
- webkit_script_dialog_confirm_set_confirmed (dialog, TRUE);
+ if (webkit_script_dialog_get_dialog_type (dialog) == WEBKIT_SCRIPT_DIALOG_BEFORE_UNLOAD_CONFIRM)
+ webkit_script_dialog_confirm_set_confirmed (dialog, TRUE);
- return TRUE;
+ return WEBKIT_WEB_VIEW_CLASS (ephy_web_view_parent_class)->script_dialog (web_view, dialog);
}
static const char *
diff --git a/meson.build b/meson.build
index 73ee6529c..f2b7ca948 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project('epiphany', 'c',
license: 'GPL3+',
- version: '3.34.3.1',
+ version: '3.34.4',
meson_version: '>= 0.46.0',
default_options: ['c_std=gnu11',
'warning_level=2']