[at-spi2-core: 2/5] Revert "spi_atk_create_socket(): escape the dbus address, just like the atspi launcher does"




commit 66a1134da9460345a3a5f2f92551442da3610431
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Jun 9 20:19:22 2022 -0500

    Revert "spi_atk_create_socket(): escape the dbus address, just like the atspi launcher does"
    
    The reversion makes the at-spi2-atk tests work if XDG_RUNTIME_DIR
    is not set to a directory with funny characters in it.
    
    If we unconditionally escape spi_global_app_data->app_bus_addr, then
    escaped_address ends up having something like unix%3a... and these
    errors:
    
    ** (app-test:939): WARNING **: 00:54:30.136: atk-bridge: Couldn't listen on dbus server: Address does not 
contain a colon
    
    So, my fix for dbus's complaints about funny characters was wrong.
    Let's try again.
    
    This reverts commit 6fd1c44ad36eda5f4f6d11ffb6ef198e39364233.

 atk-adaptor/bridge.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
---
diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 3d564adf..8cb6ecc4 100644
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -931,7 +931,6 @@ spi_atk_create_socket (SpiBridge *app)
   DBusServer *server;
   DBusError error;
   const gchar *user_runtime_dir = g_get_user_runtime_dir ();
-  char *escaped_address;
 
   if (g_mkdir_with_parents (user_runtime_dir, 0700) != 0)
     return -1;
@@ -958,10 +957,7 @@ spi_atk_create_socket (SpiBridge *app)
     return -1;
 
   dbus_error_init(&error);
-  escaped_address = dbus_address_escape_value(spi_global_app_data->app_bus_addr);
-  server = dbus_server_listen(escaped_address, &error);
-  dbus_free(escaped_address);
-
+  server = dbus_server_listen(spi_global_app_data->app_bus_addr, &error);
   if (server == NULL)
   {
     g_warning ("atk-bridge: Couldn't listen on dbus server: %s", error.message);


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