[at-spi2-core: 1/2] bus-launch: Fix bus provider fallback



commit 67f96e39622a597c10d68af0b919cdd82ed54fa6
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date:   Fri Oct 5 06:41:27 2018 +0200

    bus-launch: Fix bus provider fallback
    
    Clear the error message when we attempt to launch the bus daemon or bus
    broker so that the message from the previous attempt isn't mistaken as
    another failure.

 bus/at-spi-bus-launcher.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
index 7572cb6..17f01c0 100644
--- a/bus/at-spi-bus-launcher.c
+++ b/bus/at-spi-bus-launcher.c
@@ -293,7 +293,9 @@ ensure_a11y_bus_daemon (A11yBusLauncher *app, char *config_path)
 
   if (pipe (app->pipefd) < 0)
     g_error ("Failed to create pipe: %s", strerror (errno));
-  
+
+  g_clear_pointer (&app->a11y_launch_error_message, g_free);
+
   if (!g_spawn_async (NULL,
                       argv,
                       NULL,
@@ -389,6 +391,8 @@ ensure_a11y_bus_broker (A11yBusLauncher *app, char *config_path)
   if (listen (app->listenfd, 1024) < 0)
     g_error ("Failed to listen on socket: %s", strerror(errno));
 
+  g_clear_pointer (&app->a11y_launch_error_message, g_free);
+
   if (!g_spawn_async (NULL,
                       argv,
                       NULL,


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