From 0d4a77e9a3dd1cb27a2bef192e80f720d312159e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 20 Apr 2015 07:24:03 +0000 Subject: [PATCH] kdeui: remove support for override/unmanaged window type (part 2) --- kdeui/kernel/kstartupinfo.cpp | 3 +-- kdeui/notifications/kstatusnotifieritem.cpp | 2 +- kdeui/notifications/ksystemtrayicon.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/kdeui/kernel/kstartupinfo.cpp b/kdeui/kernel/kstartupinfo.cpp index 7fd8ef74..8ecab8ef 100644 --- a/kdeui/kernel/kstartupinfo.cpp +++ b/kdeui/kernel/kstartupinfo.cpp @@ -739,9 +739,8 @@ KStartupInfo::startup_t KStartupInfo::Private::check_startup_internal( WId w_P, // ignore NET::Tool and other special window types, if they can't be matched NET::WindowType type = info.windowType( NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask - | NET::OverrideMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask ); + | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask ); if( type != NET::Normal - && type != NET::Override && type != NET::Unknown && type != NET::Dialog && type != NET::Utility ) diff --git a/kdeui/notifications/kstatusnotifieritem.cpp b/kdeui/notifications/kstatusnotifieritem.cpp index 7d3fe45a..9960b3b3 100644 --- a/kdeui/notifications/kstatusnotifieritem.cpp +++ b/kdeui/notifications/kstatusnotifieritem.cpp @@ -637,7 +637,7 @@ bool KStatusNotifierItemPrivate::checkVisibility(QPoint pos, bool perform) NET::WindowType type = info2.windowType(NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask - | NET::OverrideMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask); + | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask); if (type == NET::Dock || type == NET::TopMenu) { continue; // obscured by dock or topmenu -> ignore diff --git a/kdeui/notifications/ksystemtrayicon.cpp b/kdeui/notifications/ksystemtrayicon.cpp index 500345ce..2ae28696 100644 --- a/kdeui/notifications/ksystemtrayicon.cpp +++ b/kdeui/notifications/ksystemtrayicon.cpp @@ -269,7 +269,7 @@ void KSystemTrayIcon::activateOrHide( QSystemTrayIcon::ActivationReason reasonCa continue; // obscured by window kept above -> ignore NET::WindowType type = info2.windowType( NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask - | NET::OverrideMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask ); + | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask ); if( type == NET::Dock || type == NET::TopMenu ) continue; // obscured by dock or topmenu -> ignore pw->raise();