From 507c6ba7844d1128f501534bee592c12ed4e251e Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sat, 22 Feb 2020 18:53:56 +0100
Subject: [PATCH] Code cleanup

---
 src/message.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/message.c b/src/message.c
index 7c66e75..8d0f78e 100644
--- a/src/message.c
+++ b/src/message.c
@@ -126,22 +126,24 @@ int desktop_message_send(char const * destination, uint32_t value1,
 		uint32_t value2, uint32_t value3)
 {
 #if GTK_CHECK_VERSION(3, 0, 0)
+	GdkDisplay * display;
+	Display * xdisplay;
 	XEvent xev;
 	XClientMessageEvent * xcme = &xev.xclient;
 
+	display = gdk_display_get_default();
+	xdisplay = gdk_x11_display_get_xdisplay(display);
 	memset(&xev, 0, sizeof(xev));
 	xev.type = ClientMessage;
 	xcme->serial = 0;
 	xcme->send_event = True;
-	xcme->message_type = XInternAtom(gdk_x11_get_default_xdisplay(),
-			destination, FALSE);
+	xcme->message_type = XInternAtom(xdisplay, destination, FALSE);
 	xcme->format = 32;
 	xcme->data.l[0] = value1;
 	xcme->data.l[1] = value2;
 	xcme->data.l[2] = value3;
 	gdk_error_trap_push();
-	XSendEvent(gdk_x11_get_default_xdisplay(),
-			gdk_x11_get_default_root_xwindow(), False,
+	XSendEvent(xdisplay, gdk_x11_get_default_root_xwindow(), False,
 			StructureNotifyMask | /* XXX check the mask */
 			SubstructureNotifyMask | SubstructureRedirectMask,
 			&xev);