generic: misc cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kuassel/CMakeLists.txt b/kuassel/CMakeLists.txt
index 15104e9..828615f 100644 (file)
--- a/kuassel/CMakeLists.txt
+++ b/kuassel/CMakeLists.txt
@@ -8,6 +8,22 @@
 
 project(KuasselIRC)
 
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    find_package(KDE4 4.14.3 REQUIRED)
+    include( KDE4Defaults )
+    include_directories(${KDE4_INCLUDES})
+
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+    add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+
+    # If definitions like -D_GNU_SOURCE are needed for these checks they
+    # should be added to _KDE4_PLATFORM_DEFINITIONS when it is originally
+    # defined outside this file.  Here we include these definitions in
+    # CMAKE_REQUIRED_DEFINITIONS so they will be included in the build of
+    # checks below.
+    set( CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} )
+endif()
+
 # Version
 set(QUASSEL_VERSION_STRING "0.12")
 

diff --git a/kuassel/src/uisupport/graphicalui.cpp b/kuassel/src/uisupport/graphicalui.cpp
index 83b38b0..39330f9 100644 (file)
--- a/kuassel/src/uisupport/graphicalui.cpp
+++ b/kuassel/src/uisupport/graphicalui.cpp
@@ -173,10 +173,10 @@ bool GraphicalUi::checkMainWidgetVisibility(bool perform)
 
             NET::WindowType type = info2.windowType(NET::NormalMask | NET::DesktopMask
                 | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask
-                | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask);
+                | NET::UtilityMask | NET::SplashMask);
 
-            if (type == NET::Dock || type == NET::TopMenu)
-                continue;  // obscured by dock or topmenu -> ignore
+            if (type == NET::Dock)
+                continue;  // obscured by dock -> ignore
 
             if (perform) {
                 KWindowSystem::raiseWindow(mainWidget()->winId());