Merge branch 'master' into next

[i3/i3] / i3bar / include / xcb_atoms.def

diff --git a/i3bar/include/xcb_atoms.def b/i3bar/include/xcb_atoms.def
index 3f2b9775db4d0904b0f2ef8088e0c38eeadfceec..b75ceabd538afa3a96aba1fb87fd1a23f06a6403 100644 (file)
--- a/i3bar/include/xcb_atoms.def
+++ b/i3bar/include/xcb_atoms.def
@@ -2,11 +2,10 @@ ATOM_DO(_NET_WM_WINDOW_TYPE)
 ATOM_DO(_NET_WM_WINDOW_TYPE_DOCK)
 ATOM_DO(_NET_WM_STRUT_PARTIAL)
 ATOM_DO(I3_SOCKET_PATH)
-ATOM_DO(_NET_SYSTEM_TRAY_S0)
 ATOM_DO(MANAGER)
 ATOM_DO(_NET_SYSTEM_TRAY_ORIENTATION)
 ATOM_DO(_NET_SYSTEM_TRAY_VISUAL)
-ATOM_DO(CARDINAL)
 ATOM_DO(_NET_SYSTEM_TRAY_OPCODE)
 ATOM_DO(_XEMBED_INFO)
+ATOM_DO(_XEMBED)
 #undef ATOM_DO