Use only two GKeyfileSettingsBackends per process

Garnacho says that using a different GKeyfileSettingsBackend for each
GSettings instance is causing Epiphany to consume thousands of inotify
handles. Uh-oh. This is unnecessary so let's just avoid it.

Probably fixes #865

1 files changed, 10 insertions, 7 deletions

diff --git a/lib/ephy-settings.c b/lib/ephy-settings.c
index 2d29b5618..b2b568c8d 100644
--- a/lib/ephy-settings.c
+++ b/lib/ephy-settings.c
@@ -204,7 +204,7 @@ ephy_settings_get_for_web_process_extension (const char *schema)
   gsettings = g_hash_table_lookup (settings, key_name);
 
   if (gsettings == NULL) {
-    g_autoptr (GSettingsBackend) backend = NULL;
+    static GSettingsBackend *backend = NULL;
     g_autoptr (GSettings) web_gsettings = NULL;
     g_autofree char *keyfile_path = NULL;
     g_autofree char *path = NULL;
@@ -212,17 +212,20 @@ ephy_settings_get_for_web_process_extension (const char *schema)
     gsettings = ephy_settings_get (schema);
     g_assert (gsettings != NULL);
 
-    /* GLib inside Flatpak will default to this backend in the future */
-    /* so we don't need to do anything extra */
+    /* GLib inside Flatpak already defaults to this backend. */
     g_object_get (gsettings, "backend", &backend, NULL);
-    /* G_IS_KEYFILE_SETTINGS_BACKEND () is private API */
-    if (!g_strcmp0 (g_type_name (G_TYPE_FROM_INSTANCE (backend)), "GKeyfileSettingsBackend")) {
+    if (g_strcmp0 (g_type_name (G_TYPE_FROM_INSTANCE (backend)), "GKeyfileSettingsBackend") == 0) {
       g_hash_table_insert (settings, g_steal_pointer (&key_name), g_object_ref (gsettings));
       return gsettings;
     }
 
-    keyfile_path = g_build_filename (ephy_config_dir (), "web-extension-settings.ini", NULL);
-    backend = g_keyfile_settings_backend_new (keyfile_path, "/", "/");
+    if (!backend) {
+      /* The GKeyfileBackend needs to be shared to avoid overconsumption of
+       * inotify handles. See: epiphany #865.
+       */
+      keyfile_path = g_build_filename (ephy_config_dir (), "web-extension-settings.ini", NULL);
+      backend = g_keyfile_settings_backend_new (keyfile_path, "/", "/");
+    }
 
     path = get_relocatable_path (schema);
     if (path != NULL)