From f7d317601e68663728d882f152b7c9bc4007d34c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Wed, 15 Jul 2015 12:02:31 +0200
Subject: [PATCH] Install a categories file for kdebugsettings

Instead of setting our own filter rules we install a categories file
to allow to configure them. This seems to still have them enabled by
default, but should at least give distributions the possibility to
disable logging by default.
---
 data/CMakeLists.txt          | 1 +
 data/org_kde_kwin.categories | 8 ++++++++
 main.cpp                     | 7 -------
 main.h                       | 1 -
 main_wayland.cpp             | 1 -
 main_x11.cpp                 | 1 -
 6 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 data/org_kde_kwin.categories

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 26274ada70..44ac59b53c 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -8,4 +8,5 @@ install(TARGETS kwin5_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_
 ########### install files ###############
 
 install( FILES stripTitle.js  DESTINATION  ${DATA_INSTALL_DIR}/kwin )
+install( FILES org_kde_kwin.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
diff --git a/data/org_kde_kwin.categories b/data/org_kde_kwin.categories
new file mode 100644
index 0000000000..9fa463923b
--- /dev/null
+++ b/data/org_kde_kwin.categories
@@ -0,0 +1,8 @@
+kwin_core KWin Core
+kwineffects KWin Effects
+kwin_wayland_drm KWin Wayland (DRM backend)
+kwin_wayland_framebuffer KWin Wayland (Framebuffer backend)
+kwin_wayland_hwcomposer KWin Wayland (hwcomposer backend)
+kwin_wayland_backend KWin Wayland (Wayland backend)
+kwin_wayland_x11windowed KWin Wayland (X11 backend)
+aurorae KWin Aurorae Window Decoration Engine
diff --git a/main.cpp b/main.cpp
index 2c33f02e52..db9598a636 100644
--- a/main.cpp
+++ b/main.cpp
@@ -346,13 +346,6 @@ void Application::setupLocalizedString()
     KLocalizedString::setApplicationDomain("kwin");
 }
 
-void Application::setupLoggingCategoryFilters()
-{
-    QLoggingCategory::setFilterRules(QStringLiteral("aurorae.debug = true\n") +
-                                     QStringLiteral("kwineffects.debug = true\n") +
-                                     QStringLiteral("kwin_core.debug = true"));
-}
-
 void Application::notifyKSplash()
 {
     // Tell KSplash that KWin has started
diff --git a/main.h b/main.h
index 2f447cd169..4a2a7e994f 100644
--- a/main.h
+++ b/main.h
@@ -146,7 +146,6 @@ public:
 
     static void setupMalloc();
     static void setupLocalizedString();
-    static void setupLoggingCategoryFilters();
 
     static bool usesLibinput();
     static void setUseLibinput(bool use);
diff --git a/main_wayland.cpp b/main_wayland.cpp
index b1b778d6bc..d78df28904 100644
--- a/main_wayland.cpp
+++ b/main_wayland.cpp
@@ -432,7 +432,6 @@ int main(int argc, char * argv[])
 
     KWin::Application::setupMalloc();
     KWin::Application::setupLocalizedString();
-    KWin::Application::setupLoggingCategoryFilters();
 
     if (signal(SIGTERM, KWin::sighandler) == SIG_IGN)
         signal(SIGTERM, SIG_IGN);
diff --git a/main_x11.cpp b/main_x11.cpp
index e2e42d8de8..5cb1f5de6f 100644
--- a/main_x11.cpp
+++ b/main_x11.cpp
@@ -195,7 +195,6 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
 {
     KWin::Application::setupMalloc();
     KWin::Application::setupLocalizedString();
-    KWin::Application::setupLoggingCategoryFilters();
 
     int primaryScreen = 0;
     xcb_connection_t *c = xcb_connect(nullptr, &primaryScreen);