diff --git a/autotests/netwininfotestclient.cpp b/autotests/netwininfotestclient.cpp --- a/autotests/netwininfotestclient.cpp +++ b/autotests/netwininfotestclient.cpp @@ -597,7 +597,7 @@ QTest::newRow("Dock") << NET::Dock << 1 << QByteArrayLiteral("_NET_WM_WINDOW_TYPE_DOCK") << QByteArray(); QTest::newRow("Desktop") << NET::Desktop << 1 << QByteArrayLiteral("_NET_WM_WINDOW_TYPE_DESKTOP") << QByteArray(); QTest::newRow("Tooltip") << NET::Tooltip << 1 << QByteArrayLiteral("_NET_WM_WINDOW_TYPE_TOOLTIP") << QByteArray(); - QTest::newRow("ComboBox") << NET::ComboBox << 1 << QByteArrayLiteral("_NET_WM_WINDOW_TYPE_COMBOBOX") << QByteArray(); + QTest::newRow("ComboBox") << NET::ComboBox << 1 << QByteArrayLiteral("_NET_WM_WINDOW_TYPE_COMBO") << QByteArray(); QTest::newRow("DNDIcon") << NET::DNDIcon << 1 << QByteArrayLiteral("_NET_WM_WINDOW_TYPE_DND") << QByteArray(); QTest::newRow("Normal") << NET::Normal << 1 << QByteArrayLiteral("_NET_WM_WINDOW_TYPE_NORMAL") << QByteArray(); QTest::newRow("OnScreenDisplay") << NET::OnScreenDisplay << 1 << QByteArrayLiteral("_KDE_NET_WM_WINDOW_TYPE_ON_SCREEN_DISPLAY") << QByteArray(); diff --git a/src/platforms/xcb/atoms_p.h b/src/platforms/xcb/atoms_p.h --- a/src/platforms/xcb/atoms_p.h +++ b/src/platforms/xcb/atoms_p.h @@ -117,7 +117,7 @@ ENUM(_NET_WM_WINDOW_TYPE_POPUP_MENU), ENUM(_NET_WM_WINDOW_TYPE_TOOLTIP), ENUM(_NET_WM_WINDOW_TYPE_NOTIFICATION), - ENUM(_NET_WM_WINDOW_TYPE_COMBOBOX), + ENUM(_NET_WM_WINDOW_TYPE_COMBO), ENUM(_NET_WM_WINDOW_TYPE_DND), // application window state diff --git a/src/platforms/xcb/netwm.cpp b/src/platforms/xcb/netwm.cpp --- a/src/platforms/xcb/netwm.cpp +++ b/src/platforms/xcb/netwm.cpp @@ -961,7 +961,7 @@ atoms[pnum++] = p->atom(_NET_WM_WINDOW_TYPE_NOTIFICATION); } if (p->windowTypes & ComboBoxMask) { - atoms[pnum++] = p->atom(_NET_WM_WINDOW_TYPE_COMBOBOX); + atoms[pnum++] = p->atom(_NET_WM_WINDOW_TYPE_COMBO); } if (p->windowTypes & DNDIconMask) { atoms[pnum++] = p->atom(_NET_WM_WINDOW_TYPE_DND); @@ -1286,7 +1286,7 @@ p->windowTypes |= TooltipMask; } else if (atom == p->atom(_NET_WM_WINDOW_TYPE_NOTIFICATION)) { p->windowTypes |= NotificationMask; - } else if (atom == p->atom(_NET_WM_WINDOW_TYPE_COMBOBOX)) { + } else if (atom == p->atom(_NET_WM_WINDOW_TYPE_COMBO)) { p->windowTypes |= ComboBoxMask; } else if (atom == p->atom(_NET_WM_WINDOW_TYPE_DND)) { p->windowTypes |= DNDIconMask; @@ -3194,7 +3194,7 @@ break; case ComboBox: - data[0] = p->atom(_NET_WM_WINDOW_TYPE_COMBOBOX); + data[0] = p->atom(_NET_WM_WINDOW_TYPE_COMBO); data[1] = XCB_NONE; len = 1; break; @@ -4213,7 +4213,7 @@ p->types[pos++] = Notification; } - else if (type == p->atom(_NET_WM_WINDOW_TYPE_COMBOBOX)) { + else if (type == p->atom(_NET_WM_WINDOW_TYPE_COMBO)) { p->types[pos++] = ComboBox; }