[epiphany] Revert "embed-shell: use a unix:dir address for the D-Bus server"



commit 038b77c7e9f171d02143f98f8369eb0a3332a6d4
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Jul 1 14:01:17 2019 -0500

    Revert "embed-shell: use a unix:dir address for the D-Bus server"
    
    This reverts commit 8d768e0c159da29d3677f5920bae347c8ed597f8.

 embed/ephy-embed-shell.c | 8 ++------
 meson.build              | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index ad0b7a274..0b1b91c99 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -1032,11 +1032,7 @@ ephy_embed_shell_setup_web_process_extensions_server (EphyEmbedShell *shell)
   g_autofree char *address = NULL;
   g_autoptr(GError) error = NULL;
 
-  /* Due to the bubblewrap sandbox, we cannot use any abstract sockets here.
-   * This means that unix:tmpdir= or unix:abstract= addresses will not work.
-   * Using unix:dir= guarantees that abstract sockets won't be used.
-   */
-  address = g_strdup_printf ("unix:dir=%s", ephy_file_tmp_dir ());
+  address = g_strdup_printf ("unix:tmpdir=%s", g_get_tmp_dir ());
 
   observer = g_dbus_auth_observer_new ();
 
@@ -1056,7 +1052,7 @@ ephy_embed_shell_setup_web_process_extensions_server (EphyEmbedShell *shell)
                                               &error);
 
   if (error) {
-    g_warning ("Failed to start embed shell D-Bus server on %s: %s", address, error->message);
+    g_warning ("Failed to start web process extension server on %s: %s", address, error->message);
     return;
   }
 
diff --git a/meson.build b/meson.build
index 27fa538d2..2a54c6c7a 100644
--- a/meson.build
+++ b/meson.build
@@ -73,7 +73,7 @@ config_h = declare_dependency(
   )
 )
 
-glib_requirement = '>= 2.61.2'
+glib_requirement = '>= 2.56.0'
 gtk_requirement = '>= 3.24.0'
 nettle_requirement = '>= 3.4'
 webkitgtk_requirement = '>= 2.25.1'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]