From bdf7cef90e176c73918931b43fd88aa74f3a19c8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 17 Aug 2020 19:34:24 +0100
Subject: [PATCH] launch: Fix removal of signalfd GSource

signal_source and forward_signals_id were redundant. We only need one.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 src/launch.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/launch.c b/src/launch.c
index 1bb80980e..8a8e65713 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -454,7 +454,6 @@ main (int argc,
   GError **error = &local_error;
   g_autoptr(GPtrArray) env_prefix = NULL;
   char **command_and_args;
-  guint forward_signals_id = 0;
   g_autoptr(FILE) original_stdout = NULL;
   g_autoptr(GDBusConnection) session_bus = NULL;
   g_autoptr(GDBusConnection) peer_connection = NULL;
@@ -853,8 +852,8 @@ out:
   if (local_error != NULL)
     g_warning ("%s", local_error->message);
 
-  if (forward_signals_id > 0)
-    g_source_remove (forward_signals_id);
+  if (signal_source > 0)
+    g_source_remove (signal_source);
 
   g_strfreev (forward_fds);
   g_free (opt_directory);
-- 
GitLab