From 175af4f74fc6c0896067b18483073638e8b3f674 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 6 Mar 2020 12:33:05 +0100 Subject: [PATCH] xwayland: remove duplicate _NET_WM_NAME entry --- include/xwayland/xwm.h | 1 - xwayland/xwm.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/xwayland/xwm.h b/include/xwayland/xwm.h index d7659ea0..9f46d433 100644 --- a/include/xwayland/xwm.h +++ b/include/xwayland/xwm.h @@ -39,7 +39,6 @@ enum atom_name { WINDOW, _NET_ACTIVE_WINDOW, _NET_WM_MOVERESIZE, - _NET_WM_NAME, _NET_SUPPORTING_WM_CHECK, _NET_WM_STATE_MODAL, _NET_WM_STATE_FULLSCREEN, diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 1cbc5921..429c0455 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -37,7 +37,6 @@ const char *atom_map[ATOM_LAST] = { [WINDOW] = "WINDOW", [_NET_ACTIVE_WINDOW] = "_NET_ACTIVE_WINDOW", [_NET_WM_MOVERESIZE] = "_NET_WM_MOVERESIZE", - [_NET_WM_NAME] = "_NET_WM_NAME", [_NET_SUPPORTING_WM_CHECK] = "_NET_SUPPORTING_WM_CHECK", [_NET_WM_STATE_MODAL] = "_NET_WM_STATE_MODAL", [_NET_WM_STATE_FULLSCREEN] = "_NET_WM_STATE_FULLSCREEN", @@ -1562,7 +1561,7 @@ static void xwm_create_wm_window(struct wlr_xwm *xwm) { xcb_change_property(xwm->xcb_conn, XCB_PROP_MODE_REPLACE, xwm->window, - xwm->atoms[_NET_WM_NAME], + xwm->atoms[NET_WM_NAME], xwm->atoms[UTF8_STRING], 8, // format strlen(name), name);