Fabio Tomat · Michael Catanzaro · Michael Catanzaro · Michael Catanzaro · Michael Catanzaro · Daniel Mustieles
--- a/NEWS
+++ b/NEWS
+40.2 - June 4, 2021
+===================
+
+ * Fix some memory leaks (from !958)
+ * Fix memory corruption in history dialog (!960)
+ * Fix crash when checking for modified forms (!962)
+
 40.1 - April 29, 2021
 =====================


--- a/data/org.gnome.Epiphany.appdata.xml.in.in
+++ b/data/org.gnome.Epiphany.appdata.xml.in.in
@@ -48,6 +48,7 @@
    <value key="Purism::form_factor">mobile</value>
  </custom>
  <releases>
+    <release date="2021-06-04" version="40.2"/>
    <release date="2021-04-29" version="40.1"/>
    <release date="2021-03-19" version="40.0"/>
    <release date="2021-03-12" version="40~rc"/>

--- a/embed/ephy-filters-manager.c
+++ b/embed/ephy-filters-manager.c
@@ -230,6 +230,7 @@ sidecar_bytes_loaded_cb (GFile        *file,
  } else {
    g_task_return_error (task, error);
  }
+  g_object_unref (task);
 }

 static void

--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -3146,7 +3146,6 @@ has_modified_forms_cb (WebKitWebView *view,
  } else {
    retval = jsc_value_to_boolean (webkit_javascript_result_get_js_value (js_result));
    g_task_return_boolean (task, retval);
-    webkit_javascript_result_unref (js_result);
  }

 out:

--- a/help/es/es.po
+++ b/help/es/es.po
--- a/meson.build
+++ b/meson.build
 project('epiphany', 'c',
  license: 'GPL3+',
-  version: '40.1',
+  version: '40.2',
  meson_version: '>= 0.47.0',
  default_options: ['c_std=gnu11',
                    'warning_level=2']

--- a/po/fur.po
+++ b/po/fur.po
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,10 +9,10 @@
 # Åka Sikrom <a4 ætt hush dått com>, 2015-2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: epiphany 3.40.x\n"
+"Project-Id-Version: epiphany 4.0\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/epiphany/issues\n"
-"POT-Creation-Date: 2021-03-13 09:03+0000\n"
-"PO-Revision-Date: 2021-03-13 10:51+0100\n"
+"POT-Creation-Date: 2021-05-10 11:32+0000\n"
+"PO-Revision-Date: 2021-05-11 12:49+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -55,7 +55,7 @@ msgstr "GNOME prosjektet"

 #: data/org.gnome.Epiphany.desktop.in.in:3 embed/ephy-about-handler.c:192
 #: embed/ephy-about-handler.c:226 src/ephy-main.c:102 src/ephy-main.c:254
-#: src/ephy-main.c:406 src/window-commands.c:1009
+#: src/ephy-main.c:406 src/window-commands.c:1011
 msgid "Web"
 msgstr "Internett"

@@ -888,7 +888,7 @@ msgstr "Versjon %s"
 msgid "About Web"
 msgstr "Om Nettleser"

-#: embed/ephy-about-handler.c:194 src/window-commands.c:1011
+#: embed/ephy-about-handler.c:194 src/window-commands.c:1013
 msgid "Epiphany Technology Preview"
 msgstr "Epiphany teknologiforhåndsvisning"

@@ -986,13 +986,13 @@ msgid "Download requested"
 msgstr "Nedlasting forespurt"

 #: embed/ephy-download.c:819 lib/widgets/ephy-file-chooser.c:164
-#: src/ephy-web-extension-dialog.c:75 src/ephy-web-extension-dialog.c:242
+#: src/ephy-web-extension-dialog.c:75 src/ephy-web-extension-dialog.c:243
 #: src/resources/gtk/firefox-sync-dialog.ui:173
 #: src/resources/gtk/history-dialog.ui:96
-#: src/resources/gtk/prefs-lang-dialog.ui:16 src/window-commands.c:276
-#: src/window-commands.c:334 src/window-commands.c:378
-#: src/window-commands.c:562 src/window-commands.c:647
-#: src/window-commands.c:809 src/window-commands.c:1889
+#: src/resources/gtk/prefs-lang-dialog.ui:16 src/window-commands.c:278
+#: src/window-commands.c:336 src/window-commands.c:380
+#: src/window-commands.c:564 src/window-commands.c:649
+#: src/window-commands.c:811 src/window-commands.c:1891
 msgid "_Cancel"
 msgstr "A_vbryt"

@@ -1403,7 +1403,7 @@ msgstr "Finn neste forekomst av søketeksten"
 msgid "%s is not a valid URI"
 msgstr "%s er ikke en gyldig URI"

-#: embed/ephy-web-view.c:189 src/window-commands.c:1351
+#: embed/ephy-web-view.c:189 src/window-commands.c:1353
 msgid "Open"
 msgstr "Åpne"

@@ -1417,7 +1417,7 @@ msgid "_Never Save"
 msgstr "Al_dri lagre"

 #: embed/ephy-web-view.c:370 lib/widgets/ephy-file-chooser.c:175
-#: src/resources/gtk/firefox-sync-dialog.ui:182 src/window-commands.c:646
+#: src/resources/gtk/firefox-sync-dialog.ui:182 src/window-commands.c:648
 msgid "_Save"
 msgstr "_Lagre"

@@ -1792,7 +1792,7 @@ msgstr "Ingen valgt"
 msgid "Technical information"
 msgstr "Teknisk informasjon"

-#: embed/ephy-web-view.c:3464
+#: embed/ephy-web-view.c:3462
 msgid "_OK"
 msgstr "_OK"

@@ -1945,7 +1945,9 @@ msgstr "Klarte ikke å hente påloggingsinformasjon for lagring."
 #: lib/sync/ephy-sync-service.c:863 lib/sync/ephy-sync-service.c:980
 #: lib/sync/ephy-sync-service.c:1758
 msgid "Please visit Firefox Sync and sign in again to continue syncing."
-msgstr "Gå til Firefox Sync og logg inn igjen for å fortsette synkroniseringsprosessen."
+msgstr ""
+"Gå til Firefox Sync og logg inn igjen for å fortsette "
+"synkroniseringsprosessen."

 #: lib/sync/ephy-sync-service.c:970
 msgid "The password of your Firefox account seems to have been changed."
@@ -1955,7 +1957,9 @@ msgstr "Passordet for din Firefox-konto ser ut til å ha blitt endret."
 msgid ""
 "Please visit Firefox Sync and sign in with the new password to continue "
 "syncing."
-msgstr "Gå til Firefox Sync og logg inn med det nye passordet for å fortsette synkroniseringsprosessen."
+msgstr ""
+"Gå til Firefox Sync og logg inn med det nye passordet for å fortsette "
+"synkroniseringsprosessen."

 #: lib/sync/ephy-sync-service.c:979
 msgid "Failed to obtain signed certificate."
@@ -2131,7 +2135,7 @@ msgstr "Avbryter …"
 msgid "Starting…"
 msgstr "Starter …"

-#: lib/widgets/ephy-file-chooser.c:173 src/ephy-web-extension-dialog.c:243
+#: lib/widgets/ephy-file-chooser.c:173 src/ephy-web-extension-dialog.c:242
 #: src/resources/gtk/history-dialog.ui:277
 msgid "_Open"
 msgstr "_Åpne"
@@ -2259,6 +2263,10 @@ msgstr "Tilgang til kamera"
 msgid "Media autoplay"
 msgstr "Automatisk avspilling av medier"

+#: lib/widgets/ephy-security-popover.c:579
+msgid "Without Sound"
+msgstr "Uten lyd"
+
 #: src/bookmarks/ephy-bookmark-row.c:62
 msgid "Bookmark Properties"
 msgstr "Egenskaper for bokmerke"
@@ -2316,11 +2324,11 @@ msgid "Mobile"
 msgstr "Mobil"

 #. Translators: tooltip for the refresh button
-#: src/ephy-action-bar-start.c:37 src/ephy-header-bar.c:50
+#: src/ephy-action-bar-start.c:37 src/ephy-header-bar.c:52
 msgid "Reload the current page"
 msgstr "Last denne siden på nytt"

-#: src/ephy-action-bar-start.c:646 src/ephy-header-bar.c:443
+#: src/ephy-action-bar-start.c:643 src/ephy-header-bar.c:474
 msgid "Stop loading the current page"
 msgstr "Stopp lasting av denne siden"

@@ -2446,11 +2454,11 @@ msgstr "Åpne fil (manifest.json/xpi)"
 msgid "Do you want to leave this website?"
 msgstr "Vil du forlate dette nettstedet"

-#: src/ephy-window.c:283 src/window-commands.c:1199
+#: src/ephy-window.c:283 src/window-commands.c:1201
 msgid "A form you modified has not been submitted."
 msgstr "Et skjema du har endret er ikke sendt inn."

-#: src/ephy-window.c:284 src/window-commands.c:1201
+#: src/ephy-window.c:284 src/window-commands.c:1203
 msgid "_Discard form"
 msgstr "_Forkast skjema"

@@ -2617,15 +2625,15 @@ msgstr "Åpne lenke i nytt vindu"
 msgid "Open Link In Incognito Window"
 msgstr "Åpne lenke i inkognitovindu"

-#: src/ephy-window.c:2885
+#: src/ephy-window.c:2872
 msgid "Download operation"
 msgstr "Nedlastingsoperasjon"

-#: src/ephy-window.c:2887
+#: src/ephy-window.c:2874
 msgid "Show details"
 msgstr "Vis detaljer"

-#: src/ephy-window.c:2889
+#: src/ephy-window.c:2876
 #, c-format
 msgid "%d download operation active"
 msgid_plural "%d download operations active"
@@ -2633,23 +2641,23 @@ msgstr[0] "%d nedlastingsoperasjon aktiv"
 msgstr[1] "%d nedlastingsoperasjoner aktive"

 #. Translators: tooltip for the tab switcher menu button
-#: src/ephy-window.c:3407
+#: src/ephy-window.c:3394
 msgid "View open tabs"
 msgstr "Vis åpne faner"

-#: src/ephy-window.c:3538
+#: src/ephy-window.c:3525
 msgid "Set Web as your default browser?"
 msgstr "Sett Nettleser som din forvalgte nettleser?"

-#: src/ephy-window.c:3540
+#: src/ephy-window.c:3527
 msgid "Set Epiphany Technology Preview as your default browser?"
 msgstr "Sett Epiphany teknologiforhåndsvisning som din forvalgte nettleser?"

-#: src/ephy-window.c:3552
+#: src/ephy-window.c:3539
 msgid "_Yes"
 msgstr "_Ja"

-#: src/ephy-window.c:3553
+#: src/ephy-window.c:3540
 msgid "_No"
 msgstr "_Nei"

@@ -2719,7 +2727,9 @@ msgstr "Adressen er ikke en gyldig URI"
 msgid ""
 "Address is not a valid URL. The address should look like https://www.example."
 "com/search?q=%s"
-msgstr "Adressen er ikke en gyldig URL. Adressen skal se ut slik https:///www.eksempel.no/søk=q=%s"
+msgstr ""
+"Adressen er ikke en gyldig URL. Adressen skal se ut slik https:///www."
+"eksempel.no/søk=q=%s"

 #: src/preferences/ephy-search-engine-row.c:223
 #, c-format
@@ -3467,7 +3477,9 @@ msgstr "Snarvei"
 msgid ""
 "To determine the search address, perform a search using the search engine "
 "that you want to add and replace the search term with %s."
-msgstr "Utfør et søk med søkemotoren du vil legge til og erstatt søkebegrepet med %s for å bestemme søkeadressen."
+msgstr ""
+"Utfør et søk med søkemotoren du vil legge til og erstatt søkebegrepet med %s "
+"for å bestemme søkeadressen."

 #: src/resources/gtk/search-engine-row.ui:128
 msgid "R_emove Search Engine"
@@ -3843,70 +3855,70 @@ msgstr "HTML-fil"
 msgid "Firefox"
 msgstr "Firefox"

-#: src/window-commands.c:117 src/window-commands.c:697
+#: src/window-commands.c:117 src/window-commands.c:699
 msgid "Chrome"
 msgstr "Chrome"

-#: src/window-commands.c:118 src/window-commands.c:698
+#: src/window-commands.c:118 src/window-commands.c:700
 msgid "Chromium"
 msgstr "Chromium"

-#: src/window-commands.c:132 src/window-commands.c:564
-#: src/window-commands.c:783
+#: src/window-commands.c:132 src/window-commands.c:566
+#: src/window-commands.c:785
 msgid "Ch_oose File"
 msgstr "Velg _fil"

-#: src/window-commands.c:134 src/window-commands.c:333
-#: src/window-commands.c:377 src/window-commands.c:785
-#: src/window-commands.c:811
+#: src/window-commands.c:134 src/window-commands.c:335
+#: src/window-commands.c:379 src/window-commands.c:787
+#: src/window-commands.c:813
 msgid "I_mport"
 msgstr "I_mporter"

-#: src/window-commands.c:273
+#: src/window-commands.c:275
 msgid "Select Profile"
 msgstr "Velg profil"

-#: src/window-commands.c:278
+#: src/window-commands.c:280
 msgid "_Select"
 msgstr "_Velg"

-#: src/window-commands.c:330 src/window-commands.c:374
-#: src/window-commands.c:643
+#: src/window-commands.c:332 src/window-commands.c:376
+#: src/window-commands.c:645
 msgid "Choose File"
 msgstr "Velg fil"

-#: src/window-commands.c:355 src/window-commands.c:399
-#: src/window-commands.c:446 src/window-commands.c:471
-#: src/window-commands.c:496
+#: src/window-commands.c:357 src/window-commands.c:401
+#: src/window-commands.c:448 src/window-commands.c:473
+#: src/window-commands.c:498
 msgid "Bookmarks successfully imported!"
 msgstr "Bokmerkene er importert!"

-#: src/window-commands.c:559
+#: src/window-commands.c:561
 msgid "Import Bookmarks"
 msgstr "Importer bokmerker"

-#: src/window-commands.c:577 src/window-commands.c:824
+#: src/window-commands.c:579 src/window-commands.c:826
 msgid "From:"
 msgstr "Fra:"

-#: src/window-commands.c:623
+#: src/window-commands.c:625
 msgid "Bookmarks successfully exported!"
 msgstr "Bokmerkene er eksportert!"

 #. Translators: Only translate the part before ".html" (e.g. "bookmarks")
-#: src/window-commands.c:651
+#: src/window-commands.c:653
 msgid "bookmarks.html"
 msgstr "bokmerker.html"

-#: src/window-commands.c:739
+#: src/window-commands.c:741
 msgid "Passwords successfully imported!"
 msgstr "Passord er importert!"

-#: src/window-commands.c:806
+#: src/window-commands.c:808
 msgid "Import Passwords"
 msgstr "Importer passord"

-#: src/window-commands.c:997
+#: src/window-commands.c:999
 #, c-format
 msgid ""
 "A simple, clean, beautiful view of the web.\n"
@@ -3915,34 +3927,34 @@ msgstr ""
 "Enkel, vakker visning av nettet.\n"
 "Med WebKitGTK+ %d.%d.%d som motor"

-#: src/window-commands.c:1021
+#: src/window-commands.c:1023
 msgid "Website"
 msgstr "Nettsted"

-#: src/window-commands.c:1054
+#: src/window-commands.c:1056
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
 "Torstein Adolf Winterseth <kvikende@fsfe.org>"

-#: src/window-commands.c:1197
+#: src/window-commands.c:1199
 msgid "Do you want to reload this website?"
 msgstr "Vil du laste dette nettstedet på nytt?"

-#: src/window-commands.c:1726
+#: src/window-commands.c:1728
 #, c-format
 msgid "A web application named “%s” already exists. Do you want to replace it?"
 msgstr "Det finnes allerede et nettprogram med navn «%s». Vil du erstatte det?"

-#: src/window-commands.c:1729
+#: src/window-commands.c:1731
 msgid "Cancel"
 msgstr "Avbryt"

-#: src/window-commands.c:1731
+#: src/window-commands.c:1733
 msgid "Replace"
 msgstr "Erstatt"

-#: src/window-commands.c:1735
+#: src/window-commands.c:1737
 msgid ""
 "An application with the same name already exists. Replacing it will "
 "overwrite it."
@@ -3950,51 +3962,51 @@ msgstr ""
 "Det finnes allerede et program med dette navnet. Hvis du erstatter det, blir "
 "det overskrevet."

-#: src/window-commands.c:1827
+#: src/window-commands.c:1829
 #, c-format
 msgid "The application “%s” is ready to be used"
 msgstr "Programmet «%s» er klart til bruk"

-#: src/window-commands.c:1830
+#: src/window-commands.c:1832
 #, c-format
 msgid "The application “%s” could not be created"
 msgstr "Klarte ikke å lage programmet «%s»"

 #. Translators: Desktop notification when a new web app is created.
-#: src/window-commands.c:1845
+#: src/window-commands.c:1847
 msgid "Launch"
 msgstr "Start"

 #. Show dialog with icon, title.
-#: src/window-commands.c:1886
+#: src/window-commands.c:1888
 msgid "Create Web Application"
 msgstr "Lag nettsideprogram"

-#: src/window-commands.c:1891
+#: src/window-commands.c:1893
 msgid "C_reate"
 msgstr "_Lag"

-#: src/window-commands.c:2106
+#: src/window-commands.c:2108
 msgid "Save"
 msgstr "Lagre"

-#: src/window-commands.c:2115
+#: src/window-commands.c:2117
 msgid "HTML"
 msgstr "HTML"

-#: src/window-commands.c:2120
+#: src/window-commands.c:2122
 msgid "MHTML"
 msgstr "MHTML"

-#: src/window-commands.c:2125
+#: src/window-commands.c:2127
 msgid "PNG"
 msgstr "PNG"

-#: src/window-commands.c:2610
+#: src/window-commands.c:2612
 msgid "Enable caret browsing mode?"
 msgstr "Slå på markør i nettleser?"

-#: src/window-commands.c:2613
+#: src/window-commands.c:2615
 msgid ""
 "Pressing F7 turns caret browsing on or off. This feature places a moveable "
 "cursor in web pages, allowing you to move around with your keyboard. Do you "
@@ -4004,6 +4016,6 @@ msgstr ""
 "bevegelig markør på nettsidene som lar deg flytte rundt med tastaturet. Vil "
 "du slå på markørmodus?"

-#: src/window-commands.c:2616
+#: src/window-commands.c:2618
 msgid "_Enable"
 msgstr "_Slå på"
--- a/po/oc.po
+++ b/po/oc.po
--- a/src/ephy-history-dialog.c
+++ b/src/ephy-history-dialog.c
@@ -312,7 +312,7 @@ remove_pending_sorter_source (EphyHistoryDialog *self,
  g_clear_handle_id (&self->sorter_source, g_source_remove);

  if (free_urls && self->urls) {
-    ephy_history_host_list_free (self->urls);
+    ephy_history_url_list_free (self->urls);
    self->urls = NULL;
  }
 }

--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2070,11 +2070,10 @@ accept_navigation_policy_decision (EphyWindow           *window,
  g_autoptr (WebKitWebsitePolicies) website_policies = NULL;
  EphyPermission permission = EPHY_PERMISSION_UNDECIDED;
  EphyEmbedShell *shell;
-  const char *origin;
+  g_autofree char *origin = ephy_uri_to_security_origin (uri);

  shell = ephy_embed_shell_get_default ();

-  origin = ephy_uri_to_security_origin (uri);
  if (origin) {
    permission = ephy_permissions_manager_get_permission (ephy_embed_shell_get_permissions_manager (shell),
                                                          EPHY_PERMISSION_TYPE_AUTOPLAY_POLICY,