Attachment #219680 for bug #251136

View | Details | Raw Unified | Return to bug 251136
Collapse All | Expand All

Lines 3-8 Link Here

(-)x11-wm/xfce4-wm/Makefile (+1 lines)
3		3
4	PORTNAME= xfce4-wm	4	PORTNAME= xfce4-wm
5	PORTVERSION= 4.14.6	5	PORTVERSION= 4.14.6
		6	PORTREVISION= 1
6	CATEGORIES= x11-wm xfce	7	CATEGORIES= x11-wm xfce
7	MASTER_SITES= XFCE	8	MASTER_SITES= XFCE
8	DISTNAME= xfwm4-${DISTVERSIONFULL}	9	DISTNAME= xfwm4-${DISTVERSIONFULL}




--- src/client.c
+++ src/client.c
@@ -2712,10 +2712,18 @@ clientClose (Client *c)
 void
 clientKill (Client *c)
 {
+    ScreenInfo *screen_info;
+    DisplayInfo *display_info;
+
     g_return_if_fail (c != NULL);
     TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
 
-    XKillClient (clientGetXDisplay (c), c->window);
+    screen_info = c->screen_info;
+    display_info = screen_info->display_info;
+
+    myDisplayErrorTrapPush (display_info);
+    XKillClient (display_info->dpy, c->window);
+    myDisplayErrorTrapPopIgnored (display_info);
 }
 
 void

Return to bug 251136

Line 0 Link Here

(-)x11-wm/xfce4-wm/files/patch-src_client.c (+22 lines)
	1	--- src/client.c
	2	+++ src/client.c
	3	@@ -2712,10 +2712,18 @@ clientClose (Client *c)
	4	void
	5	clientKill (Client *c)
	6	{
	7	+ ScreenInfo *screen_info;
	8	+ DisplayInfo *display_info;
	9	+
	10	g_return_if_fail (c != NULL);
	11	TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
	12
	13	- XKillClient (clientGetXDisplay (c), c->window);
	14	+ screen_info = c->screen_info;
	15	+ display_info = screen_info->display_info;
	16	+
	17	+ myDisplayErrorTrapPush (display_info);
	18	+ XKillClient (display_info->dpy, c->window);
	19	+ myDisplayErrorTrapPopIgnored (display_info);
	20	}
	21
	22	void