Michael Catanzaro · Michael Catanzaro · Michael Catanzaro · Michael Catanzaro · Michael Catanzaro · Michael Catanzaro
--- a/NEWS
+++ b/NEWS
+44.1 - April 2, 2023
+====================
+
+ * Fix crash restoring session with view-source URI without host component (#1987)
+ * Fix criticals when running search provider (#2006)
+ * Increase file descriptor soft limit (#2010)
+
 44.0 - March 17, 2023
 =====================


--- a/data/org.gnome.Epiphany.appdata.xml.in.in
+++ b/data/org.gnome.Epiphany.appdata.xml.in.in
@@ -55,6 +55,7 @@
    <display_length compare="ge">360</display_length>
  </requires>
  <releases>
+    <release date="2023-04-02" version="44.1"/>
    <release date="2023-03-17" version="44.0"/>
    <release date="2023-03-03" version="44~rc"/>
    <release date="2023-02-11" version="44~beta"/>

--- a/lib/contrib/gnome-languages.c
+++ b/lib/contrib/gnome-languages.c
@@ -705,8 +705,8 @@ get_translated_language (const char *code,
        name = NULL;
        if (language != NULL) {
                const char *translated_name;
-                locale_t loc;
-                locale_t old_locale;
+                locale_t loc = (locale_t) 0;
+                locale_t old_locale = (locale_t) 0;

                if (locale != NULL) {
                        loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t) 0);

--- a/meson.build
+++ b/meson.build
 project('epiphany', 'c',
  license: 'GPL3+',
-  version: '44.0',
+  version: '44.1',
  meson_version: '>= 0.59.0',
  default_options: ['c_std=gnu11',
                    'warning_level=2']

--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -42,6 +42,7 @@
 #include <signal.h>
 #include <string.h>
 #include <stdlib.h>
+#include <sys/resource.h>

 static gboolean open_in_new_window = FALSE;

@@ -163,6 +164,28 @@ get_startup_id (void)
  return retval;
 }

+static void
+maximize_fd_limit (void)
+{
+  /* We need a relatively high number of file descriptors per web process. The
+   * default limit of 1024 will be exceeded with relatively small numbers of
+   * open tabs. Let's increase as far as we can. Note this code cannot safely
+   * go into WebKit because it will break applications that use select().
+   *
+   * https://gitlab.gnome.org/GNOME/epiphany/-/issues/2010
+   */
+  struct rlimit rlim;
+
+  if (getrlimit (RLIMIT_NOFILE, &rlim) == -1) {
+    g_warning ("Failed to read file descriptor limit: %s", g_strerror (errno));
+    return;
+  }
+
+  rlim.rlim_cur = rlim.rlim_max;
+  if (setrlimit (RLIMIT_NOFILE, &rlim) == -1)
+    g_warning ("Failed to set file descriptor limit: %s", g_strerror (errno));
+}
+
 int
 main (int   argc,
      char *argv[])
@@ -411,6 +434,8 @@ main (int   argc,
    gtk_window_set_default_icon_name (APPLICATION_ID);
  }

+  maximize_fd_limit ();
+
  _ephy_shell_create_instance (mode);

  if (search_term) {

--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -37,7 +37,6 @@
 #include "ephy-shell.h"
 #include "ephy-string.h"
 #include "ephy-tab-view.h"
-#include "ephy-view-source-handler.h"
 #include "ephy-window.h"

 #include <glib/gi18n.h>
@@ -892,7 +891,8 @@ session_seems_reasonable (GList *windows)
        if (g_uri_get_host (uri) != NULL ||
            strcmp (g_uri_get_scheme (uri), "data") == 0 ||
            strcmp (g_uri_get_scheme (uri), "file") == 0 ||
-            strcmp (g_uri_get_scheme (uri), "ephy-reader") == 0)
+            strcmp (g_uri_get_scheme (uri), "ephy-reader") == 0 ||
+            strcmp (g_uri_get_scheme (uri), "view-source") == 0)
          sane = TRUE;
      }


--- a/src/search-provider/ephy-search-provider-main.c
+++ b/src/search-provider/ephy-search-provider-main.c
@@ -48,8 +48,6 @@ main (gint    argc,
    return 1;
  }

-  _ephy_shell_create_instance (EPHY_EMBED_SHELL_MODE_SEARCH_PROVIDER);
-
  search_provider = ephy_search_provider_new ();
  status = g_application_run (G_APPLICATION (search_provider), argc, argv);
  g_object_unref (search_provider);

--- a/src/search-provider/ephy-search-provider.c
+++ b/src/search-provider/ephy-search-provider.c
@@ -49,10 +49,10 @@ struct _EphySearchProvider {
 };

 struct _EphySearchProviderClass {
-  GApplicationClass parent_class;
+  EphyEmbedShellClass parent_class;
 };

-G_DEFINE_TYPE (EphySearchProvider, ephy_search_provider, G_TYPE_APPLICATION)
+G_DEFINE_TYPE (EphySearchProvider, ephy_search_provider, EPHY_TYPE_EMBED_SHELL)

 #define INACTIVITY_TIMEOUT 60 * 1000 /* One minute, in milliseconds */

@@ -431,5 +431,6 @@ ephy_search_provider_new (void)

  return g_object_new (EPHY_TYPE_SEARCH_PROVIDER,
                       "application-id", app_id,
+                       "mode", EPHY_EMBED_SHELL_MODE_SEARCH_PROVIDER,
                       NULL);
 }
--- a/src/search-provider/ephy-search-provider.h
+++ b/src/search-provider/ephy-search-provider.h
@@ -22,6 +22,8 @@

 #include "ephy-shell-search-provider-generated.h"

+#include "ephy-embed-shell.h"
+
 #include <glib-object.h>
 #include <gio/gio.h>

@@ -29,7 +31,7 @@ G_BEGIN_DECLS

 #define EPHY_TYPE_SEARCH_PROVIDER (ephy_search_provider_get_type ())

-G_DECLARE_FINAL_TYPE (EphySearchProvider, ephy_search_provider, EPHY, SEARCH_PROVIDER, GApplication)
+G_DECLARE_FINAL_TYPE (EphySearchProvider, ephy_search_provider, EPHY, SEARCH_PROVIDER, EphyEmbedShell)

 EphySearchProvider *ephy_search_provider_new (void);


--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -1067,7 +1067,7 @@ window_cmd_show_about (GSimpleAction *action,
  adw_about_window_set_version (dialog, VERSION);
  adw_about_window_set_copyright (dialog,
                                  "Copyright © 2002–2004 Marco Pesenti Gritti\n"
-                                  "Copyright © 2003–2021 The GNOME Web Developers");
+                                  "Copyright © 2003–2023 The GNOME Web Developers");
  adw_about_window_set_developer_name (dialog, _("The GNOME Project"));

  adw_about_window_set_debug_info (dialog, debug_info);