From 5262708051a435eab413a8bc4240d9200999b4fc Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Tue, 4 Jan 2022 15:24:18 -0500
Subject: [PATCH] quicksettings/nightcolor: Remove copied  dbus file and use
 file exposed by KWin

---
 quicksettings/nightcolor/CMakeLists.txt       |   4 +-
 .../dbus/org.kde.kwin.ColorCorrect.xml        | 109 ------------------
 2 files changed, 2 insertions(+), 111 deletions(-)
 delete mode 100644 quicksettings/nightcolor/dbus/org.kde.kwin.ColorCorrect.xml

diff --git a/quicksettings/nightcolor/CMakeLists.txt b/quicksettings/nightcolor/CMakeLists.txt
index ae969fb0..36bf3991 100644
--- a/quicksettings/nightcolor/CMakeLists.txt
+++ b/quicksettings/nightcolor/CMakeLists.txt
@@ -1,8 +1,8 @@
 # SPDX-FileCopyrightText: 2022 Devin Lin <devin@kde.org>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-set_source_files_properties(dbus/org.kde.kwin.ColorCorrect.xml PROPERTIES NO_NAMESPACE TRUE)
-qt_add_dbus_interfaces(DBUS_SRCS dbus/org.kde.kwin.ColorCorrect.xml)
+set_source_files_properties(${KWIN_COLORCORRECT_INTERFACE} PROPERTIES NO_NAMESPACE TRUE)
+qt_add_dbus_interfaces(DBUS_SRCS ${KWIN_COLORCORRECT_INTERFACE})
 
 set(nightcolorplugin_SRCS
     nightcolorplugin.cpp
diff --git a/quicksettings/nightcolor/dbus/org.kde.kwin.ColorCorrect.xml b/quicksettings/nightcolor/dbus/org.kde.kwin.ColorCorrect.xml
deleted file mode 100644
index ee0cb112..00000000
--- a/quicksettings/nightcolor/dbus/org.kde.kwin.ColorCorrect.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<!-- 
-- SPDX-FileCopyrightText: 2017 Roman Gilg
-- SPDX-FileCopyrightText: 2020 Vlad Zahorodnii
-- SPDX-License-Identifier: GPL-2.0-or-later
--->
-<node>
-  <interface name="org.kde.kwin.ColorCorrect">
-    <method name="nightColorAutoLocationUpdate">
-      <arg type="d" direction="in"/>
-      <arg type="d" direction="in"/>
-    </method>
-
-    <!--
-        Creates an inhibition lock for Night Color.
-
-        You can use this method to temporarily disable Night Color feature.
-        After calling this method, the screen color temperature will be set
-        back to the neutral temperature (6500K).
-
-        This method returns a cookie that uniquely identifies the inhibition
-        request. You must pass the cookie to uninhibit() when you're done.
-
-        Note that the inhibition lock will be released automatically when
-        the service, which requested it, is unregistered.
-
-        A client is allowed to hold more than just one inhibition lock.
-    -->
-    <method name="inhibit">
-        <arg name="cookie" type="u" direction="out"/>
-    </method>
-
-    <!--
-        Releases an inhibition lock identified by the given cookie.
-
-        Note that the inhibition lock will be released automatically when
-        the service, which requested it, is unregistered.
-    -->
-    <method name="uninhibit">
-        <arg name="cookie" type="u" direction="in"/>
-    </method>
-
-    <!--
-        This property holds a value to indicate whether Night Color is inhibited.
-    -->
-    <property name="inhibited" type="b" access="read"/>
-
-    <!--
-        This property holds a value to indicate whether Night Color is enabled.
-    -->
-    <property name="enabled" type="b" access="read"/>
-
-    <!--
-        This property holds a value to indicate whether Night Color is running.
-    -->
-    <property name="running" type="b" access="read"/>
-
-    <!--
-        This property holds a value to indicate whether Night Color is available.
-    -->
-    <property name="available" type="b" access="read"/>
-
-    <!--
-        This property holds a value to indicate the current screen color temperature.
-    -->
-    <property name="currentTemperature" type="u" access="read"/>
-
-    <!--
-        This property holds a value to indicate the target screen color temperature.
-    -->
-    <property name="targetTemperature" type="u" access="read"/>
-
-    <!--
-        This property holds a value to indicate the operating mode.
-
-        Valid modes: 0 - automatic, 1 - location, 2 - timings, 3 - constant.
-    -->
-    <property name="mode" type="u" access="read"/>
-
-    <!--
-        This property holds a Unix timestamp that specifies when the previous color
-        temperature transition had started. Note that when Night Color operates in
-        the constant mode, this property holds a value of 0.
-    -->
-    <property name="previousTransitionDateTime" type="t" access="read"/>
-
-    <!--
-        This property holds a value that specifies the duration of the previous color
-        temperature transition, in milliseconds. Note that when Night Color operates
-        in the constant mode, this property holds a value of 0.
-    -->
-    <property name="previousTransitionDuration" type="u" access="read"/>
-
-    <!--
-        This property holds a Unix timestamp that specifies when the next scheduled
-        color temperature transition will start. Note that when Night Color operates
-        in the constant mode, this property holds a value of 0.
-    -->
-    <property name="scheduledTransitionDateTime" type="t" access="read"/>
-
-    <!--
-        This property holds a value that specifies the duration of next scheduled
-        color transition, in milliseconds. Note that when Night Color operates in
-        the constant mode, this property holds a value of 0.
-    -->
-    <property name="scheduledTransitionDuration" type="u" access="read"/>
-  </interface>
-</node>
-