Blame SOURCES/0005-vdagent-Remove-watch-event-on-vdagent_display_destro.patch

32eeaa
From bcbbea34d93d07d33b767f808ff3adf628b1ea0f Mon Sep 17 00:00:00 2001
32eeaa
From: Victor Toso <victortoso@redhat.com>
32eeaa
Date: Fri, 13 Jan 2023 13:54:06 +0100
32eeaa
Subject: [PATCH] vdagent: Remove watch event on vdagent_display_destroy()
32eeaa
32eeaa
To avoid main loop calling it when GIOChannel for x11 was already
32eeaa
destroyed.
32eeaa
32eeaa
Related: https://bugzilla.redhat.com/show_bug.cgi?id=2145004
32eeaa
Signed-off-by: Victor Toso <victortoso@redhat.com>
32eeaa
---
32eeaa
 src/vdagent/display.c | 6 ++++--
32eeaa
 1 file changed, 4 insertions(+), 2 deletions(-)
32eeaa
32eeaa
diff --git a/src/vdagent/display.c b/src/vdagent/display.c
32eeaa
index 790d9ad..602ab65 100644
32eeaa
--- a/src/vdagent/display.c
32eeaa
+++ b/src/vdagent/display.c
32eeaa
@@ -60,6 +60,7 @@ struct VDAgentDisplay {
32eeaa
     UdscsConnection *vdagentd;
32eeaa
     int debug;
32eeaa
     GIOChannel *x11_channel;
32eeaa
+    guint io_watch_source_id;
32eeaa
     VDAgentMutterDBus *mutter;
32eeaa
 };
32eeaa
 
32eeaa
@@ -296,7 +297,8 @@ VDAgentDisplay* vdagent_display_create(UdscsConnection *vdagentd, int debug, int
32eeaa
         return NULL;
32eeaa
     }
32eeaa
 
32eeaa
-    g_io_add_watch(display->x11_channel, G_IO_IN, x11_io_channel_cb, display);
32eeaa
+    display->io_watch_source_id =
32eeaa
+        g_io_add_watch(display->x11_channel, G_IO_IN, x11_io_channel_cb, display);
32eeaa
 
32eeaa
 
32eeaa
     /* Since we are started at the same time as the wm,
32eeaa
@@ -323,7 +325,7 @@ void vdagent_display_destroy(VDAgentDisplay *display, int vdagentd_disconnected)
32eeaa
         return;
32eeaa
     }
32eeaa
 
32eeaa
-
32eeaa
+    g_source_remove(display->io_watch_source_id);
32eeaa
     g_clear_pointer(&display->x11_channel, g_io_channel_unref);
32eeaa
     vdagent_x11_destroy(display->x11, vdagentd_disconnected);
32eeaa
 
32eeaa
-- 
32eeaa
2.39.0
32eeaa