From 23124dac073b64afc5ea25d1487b3f06814c06cf Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 7 Aug 2024 23:39:20 +0200
Subject: [PATCH] x11: Fix missing _net_wm_name field due to bad merge

---
 panda/src/x11display/x11GraphicsPipe.cxx | 1 +
 panda/src/x11display/x11GraphicsPipe.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/panda/src/x11display/x11GraphicsPipe.cxx b/panda/src/x11display/x11GraphicsPipe.cxx
index 1f74c64fdb..dda30ff5c1 100644
--- a/panda/src/x11display/x11GraphicsPipe.cxx
+++ b/panda/src/x11display/x11GraphicsPipe.cxx
@@ -409,6 +409,7 @@ x11GraphicsPipe(const std::string &display) :
   _net_startup_info = XInternAtom(_display, "_NET_STARTUP_INFO", false);
   _net_startup_info_begin = XInternAtom(_display, "_NET_STARTUP_INFO_BEGIN", false);
   _net_wm_bypass_compositor = XInternAtom(_display, "_NET_WM_BYPASS_COMPOSITOR", false);
+  _net_wm_name = XInternAtom(_display, "_NET_WM_NAME", false);
   _net_wm_pid = XInternAtom(_display, "_NET_WM_PID", false);
   _net_wm_ping = XInternAtom(_display, "_NET_WM_PING", false);
   _net_wm_state = XInternAtom(_display, "_NET_WM_STATE", false);
diff --git a/panda/src/x11display/x11GraphicsPipe.h b/panda/src/x11display/x11GraphicsPipe.h
index b0ffcf10b5..b2b69cca5e 100644
--- a/panda/src/x11display/x11GraphicsPipe.h
+++ b/panda/src/x11display/x11GraphicsPipe.h
@@ -174,6 +174,7 @@ public:
   Atom _net_startup_info;
   Atom _net_startup_info_begin;
   Atom _net_wm_bypass_compositor;
+  Atom _net_wm_name;
   Atom _net_wm_pid;
   Atom _net_wm_ping;
   Atom _net_wm_state;